diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-04 15:05:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-10 12:04:04 +0000 |
| commit | 6c73adbe1eadb7caf44971bb4b12ec0e61e596f7 (patch) | |
| tree | 1662c9060f1ed9ee909a18b1f7627c7bced1a12a /main/imap | |
| parent | 3fd45a29ad7ce1a7a710e6b987c17d04d442a764 (diff) | |
| download | aports-6c73adbe1eadb7caf44971bb4b12ec0e61e596f7.tar.bz2 aports-6c73adbe1eadb7caf44971bb4b12ec0e61e596f7.tar.xz | |
main/imap: fix linking of c-client
we need to add the libs at the end otherwise will --as-needed remove the
ssl libs and we end up with an underlinked c-client library.
Diffstat (limited to 'main/imap')
| -rw-r--r-- | main/imap/APKBUILD | 20 | ||||
| -rw-r--r-- | main/imap/c-client-2006k_GENTOO_amd64-so-fix.patch | 13 | ||||
| -rw-r--r-- | main/imap/fix-linking.patch (renamed from main/imap/c-client-2007e-ldflags.patch) | 36 |
3 files changed, 25 insertions, 44 deletions
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD index 19ef0007fb..35142ec77e 100644 --- a/main/imap/APKBUILD +++ b/main/imap/APKBUILD @@ -5,7 +5,7 @@ # build it shared pkgname=imap pkgver=2007f -pkgrel=3 +pkgrel=4 pkgdesc="An IMAP/POP server" url="http://www.washington.edu/imap" arch="all" @@ -14,9 +14,8 @@ subpackages="$pkgname-dev c-client:cclient" depends= makedepends="libressl-dev" source="ftp://ftp.cac.washington.edu/$pkgname/$pkgname-$pkgver.tar.gz - c-client-2006k_GENTOO_amd64-so-fix.patch + fix-linking.patch c-client-2006k_KOLAB_Annotations.patch - c-client-2007e-ldflags.patch " prepare() { @@ -68,14 +67,11 @@ cclient() { } md5sums="2126fd125ea26b73b20f01fcd5940369 imap-2007f.tar.gz -7f3937a871edd54203fe51f91423e204 c-client-2006k_GENTOO_amd64-so-fix.patch -c50f734aa18019ecebfc8737ca27cc22 c-client-2006k_KOLAB_Annotations.patch -d28962ed76df636ff666c09d420e1451 c-client-2007e-ldflags.patch" +affade6de21bfd66c72e50c61fed511e fix-linking.patch +c50f734aa18019ecebfc8737ca27cc22 c-client-2006k_KOLAB_Annotations.patch" sha256sums="53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 imap-2007f.tar.gz -77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184 c-client-2006k_GENTOO_amd64-so-fix.patch -cd8833d4eabd8fbad6a1588e3ee5375fced007964f1c6bcd016b34bee5d8eaf2 c-client-2006k_KOLAB_Annotations.patch -ed9b6503da3b6e9dfa3b2ee4ebca810e642a2f4e379e655330d1d269ed018ac1 c-client-2007e-ldflags.patch" +8ee94cf79ba424e94c39cd6a68e74745431051e0e830843a51067db523e37833 fix-linking.patch +cd8833d4eabd8fbad6a1588e3ee5375fced007964f1c6bcd016b34bee5d8eaf2 c-client-2006k_KOLAB_Annotations.patch" sha512sums="7c3e1d9927872001e768ff2ddbcf3af74078243efe58dd70e01d966856b7611134e4b579818691a954bade9acaeeda6f2f30f40d812b8aa20990de5cb90d5d35 imap-2007f.tar.gz -213f06e133704ed2bb9fc6900edb7a4505bf6965409ecf76502bf9cafdf7c981bca552479f8ffaa1a355d2f1c1c08dbe0453fa5bce06590f6627d0e622c70879 c-client-2006k_GENTOO_amd64-so-fix.patch -871093236b3ae300968e1e200a2389566af72ed1f62ad57c1dc617dd59e8378f29175fe07e5cfc575e022f3c27769b06850cbf21567f7cc359ca204c4d87a3af c-client-2006k_KOLAB_Annotations.patch -786cdb20bf6e8ce9587fbb3862d47bea9e7abdb0c5b1354c90d2bf2828dfb0a8d83379dd21987b8b6d295589891c784bb1c945b941f9f3262d8b97139415ea9e c-client-2007e-ldflags.patch" +f8a4b5b8759b690273ec8c86db55c3c3ebf7b358321aa829341bc65e98db0f10696b1eeae922eecada668f011b0b3231ed73c3a959b47b4cba00568bf7d231c1 fix-linking.patch +871093236b3ae300968e1e200a2389566af72ed1f62ad57c1dc617dd59e8378f29175fe07e5cfc575e022f3c27769b06850cbf21567f7cc359ca204c4d87a3af c-client-2006k_KOLAB_Annotations.patch" diff --git a/main/imap/c-client-2006k_GENTOO_amd64-so-fix.patch b/main/imap/c-client-2006k_GENTOO_amd64-so-fix.patch deleted file mode 100644 index 79b067d21f..0000000000 --- a/main/imap/c-client-2006k_GENTOO_amd64-so-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile ---- a/src/osdep/unix/Makefile Thu Feb 21 18:51:32 2008 +0100 -+++ b/src/osdep/unix/Makefile Thu Feb 21 18:53:15 2008 +0100 -@@ -962,6 +962,9 @@ onceenv: - -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS - echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS - echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE -+ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ -+ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ -+ >> ARCHIVE - echo $(OS) > OSTYPE - ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy - ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) diff --git a/main/imap/c-client-2007e-ldflags.patch b/main/imap/fix-linking.patch index f341cea39b..8933c2d6c2 100644 --- a/main/imap/c-client-2007e-ldflags.patch +++ b/main/imap/fix-linking.patch @@ -1,12 +1,20 @@ ---- a/src/osdep/unix/Makefile~ 2010-08-08 02:30:48.000000000 -0400 -+++ b/src/osdep/unix/Makefile 2010-08-08 02:31:08.758000018 -0400 -@@ -959,17 +959,17 @@ +diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile +index 78913ac..9eb9c9c 100644 +--- a/src/osdep/unix/Makefile ++++ b/src/osdep/unix/Makefile +@@ -962,21 +962,24 @@ os_sol.h: + + # Once-only environment setup + +-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c ++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c + onceenv: @echo Once-only environment setup... echo $(CC) > CCTYPE - echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS -+ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS - echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ ++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS + echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \ -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \ @@ -17,19 +25,9 @@ - echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS + echo `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE -- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ -+ echo "`$(CAT) CCTYPE` `$(CAT) LDFLAGS` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ - -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ - >> ARCHIVE ++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ ++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES) `$(CAT) LDFLAGS`" \ ++ >> ARCHIVE echo $(OS) > OSTYPE ---- a/src/osdep/unix/Makefile~ 2010-08-08 04:25:00.000000000 -0400 -+++ b/src/osdep/unix/Makefile 2010-08-08 04:36:49.720000021 -0400 -@@ -954,7 +954,7 @@ - - # Once-only environment setup - --once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c -+once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c - - onceenv: - @echo Once-only environment setup... + ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy + ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) |