Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/zcs 6357 #94

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0a42d42
Merge branch 'bugfix/ZBUG-173' into develop
thefoolwhocodes Aug 29, 2018
ec8e564
ZCS-4021:Implementation to extract jwt from Auth header bearer
thefoolwhocodes Apr 12, 2018
e4be353
ZCS-4021:Implementation to extract sub data field from payload
thefoolwhocodes Apr 12, 2018
9f8100a
ZCS-4021:Implementation to extract claim data from jwt token
thefoolwhocodes Apr 12, 2018
685b45b
ZCS-4021:Implementation to examine request header and query parameter…
thefoolwhocodes Apr 12, 2018
a1d7e0a
ZCS-4021:Upgrading regex to non greedy
thefoolwhocodes Apr 19, 2018
8e204fd
ZCS-4021: Updated changelog and version
thefoolwhocodes Aug 27, 2018
8c21de7
Merge branch 'feature/jwt' into develop
thefoolwhocodes Aug 30, 2018
972e176
ZCS-5907: proxy-component: version update 1.0.2
srivastava-ami Sep 5, 2018
0b44054
ZCS-5907: proxy-component: version update 1.0.2
srivastava-ami Sep 5, 2018
28e7199
Merge branch 'bugfix/ZCS-5907' into develop
Sep 18, 2018
c10c2b3
Multival updates * Update multival patch for new options * Increase d…
quanah Sep 10, 2018
a72cb37
ZCS-5976: Bumped up ldap-core-components for openldap 2.4.46
Sep 18, 2018
7e08d7a
ZCS-5976: Bumped up ldap-core-components for openldap 2.4.46 for zimb…
Sep 19, 2018
04e3c3d
Merge branch 'bugfix/ZCS-5976' into develop
Sep 21, 2018
77a742c
ZCS-6173: To build aspell for ubuntu 18 have to updated the version.
Oct 18, 2018
876f439
ZCS-6172: Building zimbra-openjdk from openjdk 11 tag 28
Nov 12, 2018
92e81d9
ZCS-6172: Remove openjdk-11.28.tgz from the commit as this is the fil…
Nov 12, 2018
e2ff349
Ubuntu18 releated specific changes
Dec 6, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
build/
thirdparty/openjdk/openjdk-11.28.tgz
thirdparty/openjdk/make_openjdk11.log
2 changes: 1 addition & 1 deletion thirdparty/aspell/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pvers := $(ASPELL_VERSION)
pname := aspell
pfile := $(pname)-$(pvers).tar.gz
psrc_file := $(SRC_DIR)/$(pfile)
purl := ftp://ftp.gnu.org/gnu/aspell/$(pfile)
purl := ftp://alpha.gnu.org/gnu/aspell/$(pfile)
zname := zimbra-$(pname)
zspec := $(pname).spec

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/bdb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pname := bdb
uname := db
pfile := $(uname)-$(pvers).tar.gz
psrc_file := $(SRC_DIR)/$(pfile)
purl := http://ftp.nsysu.edu.tw/FreeBSD/ports/distfiles/bdb/$(pfile)
purl := https://ftp.tw.freebsd.org/distfiles/bdb/$(pfile)
zname := zimbra-$(pname)
zspec := $(pname).spec

Expand Down
8 changes: 4 additions & 4 deletions thirdparty/freetype/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include $(PKG_ROOT)/../../package.def

pvers := $(FREETYPE_VERSION)
pname := freetype
pfile := $(pname)-$(pvers).tar.gz
pfile := $(pname)-$(pvers).tar.bz2
psrc_file := $(SRC_DIR)/$(pfile)
purl := http://download.savannah.gnu.org/releases/freetype/$(pfile)
purl := https://oss.oetiker.ch/rrdtool/pub/libs/$(pfile)
zname := zimbra-$(pname)
zspec := $(pname).spec

Expand All @@ -33,14 +33,14 @@ build_rpm:
$(CP) $(psrc_file) SOURCES/$(zname)-$(pvers).tar.gz && \
$(PKG_BUILD) $(specfile)

build_deb: z_tgz = $(zname)_$(pvers).orig.tar.gz
build_deb: z_tgz = $(zname)_$(pvers).orig.tar.bz2
build_deb: z_shlibs = $(subst $(zname)/,,$(wildcard $(zname)/debian/z*.shlibs))
build_deb:
$(CD) $(PLATFORM_DIR)/$(zname) && \
$(replace-pkginfo) debian/changelog $(z_shlibs) && \
$(replace-pathinfo) debian/rules && \
$(CP) $(psrc_file) ../$(z_tgz) && \
$(TAR) xfz ../$(z_tgz) --strip-components=1 && \
$(TAR) xfj ../$(z_tgz) --strip-components=1 && \
$(PKG_BUILD)

clean:
Expand Down
3 changes: 2 additions & 1 deletion thirdparty/mariadb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ pvers := $(MARIADB_VERSION)
pname := mariadb
pfile := $(pname)-$(pvers).tar.gz
psrc_file := $(SRC_DIR)/$(pfile)
purl := https://downloads.mariadb.org/f/$(pname)-$(pvers)/source/$(pfile)
#purl := https://downloads.mariadb.org/f/$(pname)-$(pvers)/source/$(pfile)
purl := http://ftp.hosteurope.de/mirror/archive.mariadb.org//$(pname)-$(pvers)/source/$(pfile)
zname := zimbra-$(pname)
zspec := $(pname).spec

Expand Down
Loading