Date: Sunday, December 26, 2021 @ 09:21:13 Author: pierre Revision: 433121
archrelease: copy trunk to extra-x86_64 Added: imap/repos/extra-x86_64/PKGBUILD (from rev 433120, imap/trunk/PKGBUILD) imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch (from rev 433120, imap/trunk/c-client-2006k_GENTOO_amd64-so-fix.patch) imap/repos/extra-x86_64/imap (from rev 433120, imap/trunk/imap) imap/repos/extra-x86_64/imap.install (from rev 433120, imap/trunk/imap.install) imap/repos/extra-x86_64/ipop2 (from rev 433120, imap/trunk/ipop2) imap/repos/extra-x86_64/ipop3 (from rev 433120, imap/trunk/ipop3) Deleted: imap/repos/extra-x86_64/PKGBUILD imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch imap/repos/extra-x86_64/imap imap/repos/extra-x86_64/imap.install imap/repos/extra-x86_64/ipop2 imap/repos/extra-x86_64/ipop3 ------------------------------------------+ PKGBUILD | 155 ++++++++++++++--------------- c-client-2006k_GENTOO_amd64-so-fix.patch | 26 ++-- imap | 20 +-- imap.install | 80 +++++++------- ipop2 | 20 +-- ipop3 | 20 +-- 6 files changed, 161 insertions(+), 160 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-26 09:20:58 UTC (rev 433120) +++ PKGBUILD 2021-12-26 09:21:13 UTC (rev 433121) @@ -1,77 +0,0 @@ - -pkgbase=imap -pkgname=(imap c-client) -pkgver=2007f -pkgrel=13 -arch=('x86_64') -license=('APACHE') -url="https://github.com/uw-imap/imap" -makedepends=('pam' 'git') -source=("imap-src::git+https://github.com/uw-imap/imap.git#tag=patches-FD29-RPM" - 'c-client-2006k_GENTOO_amd64-so-fix.patch' - 'imap' 'ipop2' 'ipop3') -options=('staticlibs') -sha256sums=('SKIP' - '77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184' - 'f192e6e6d7388c7f63441d4f122aa4c667a5eef93f22cb748b7aca0bfae2b034' - '43899df58e2e21adcf08ed686cfa26e793ba1e4b376dd917cba4c1e34e7214bd' - 'b91477ef6706a693ea01e2dc15a7b826b6ae89be8182f91a6817d2fb95cbdb72') - -prepare() { - cd "$srcdir/$pkgbase-src" - - sed \ - -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ - -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ - -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ - -i src/osdep/unix/Makefile - - patch -p1 -i "$srcdir/c-client-2006k_GENTOO_amd64-so-fix.patch" -} - -build() { - cd "$srcdir/$pkgbase-src" - # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd - - yes "y" | make lnp EXTRAAUTHENTICATORS=gss PASSWDTYPE=pam SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lpam" EXTRALDFLAGS="${LDFLAGS}" - -} - -package_imap() { - pkgdesc="An IMAP/POP server" - depends=('c-client') - provides=('imap-server' 'pop3-server') - conflicts=('courier-mta' 'courier-imap') - backup=(etc/xinetd.d/{imap,ipop2,ipop3}) - install=imap.install - - cd "$srcdir/$pkgbase-src" - install -d "$pkgdir/usr/bin" - install -D -m755 imapd/imapd "$pkgdir/usr/bin/imapd" - install -D -m755 ipopd/ipop2d "$pkgdir/usr/bin/ipop2d" - install -D -m755 ipopd/ipop3d "$pkgdir/usr/bin/ipop3d" - - # install xinetd.d configs - install -D -m644 ../imap "$pkgdir/etc/xinetd.d/imap" - install -D -m644 ../ipop2 "$pkgdir/etc/xinetd.d/ipop2" - install -D -m644 ../ipop3 "$pkgdir/etc/xinetd.d/ipop3" -} - -package_c-client() { - pkgdesc="Imap client library" - depends=('pam') - - cd "$srcdir/$pkgbase-src" - - for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ - osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do - install -D -m644 c-client/${i}.h "$pkgdir/usr/include/imap/${i}.h" - done - install -m644 c-client/linkage.c "$pkgdir/usr/include/imap/linkage.c" - install -D -m644 c-client/c-client.a "$pkgdir/usr/lib/c-client.a" - ln -sf c-client.a "$pkgdir/usr/lib/libc-client.a" - - install -D -m755 c-client/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1.0.0" - ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1" - ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so" -} Copied: imap/repos/extra-x86_64/PKGBUILD (from rev 433120, imap/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,78 @@ + +pkgbase=imap +pkgname=(imap c-client) +pkgver=2007f +pkgrel=14 +arch=('x86_64') +license=('APACHE') +url="https://github.com/uw-imap/imap" +makedepends=('pam' 'git') +source=("imap-src::git+https://github.com/uw-imap/imap.git#tag=patches-FD29-RPM" + 'c-client-2006k_GENTOO_amd64-so-fix.patch' + 'imap' 'ipop2' 'ipop3') +options=('staticlibs') +sha256sums=('SKIP' + '77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184' + 'f192e6e6d7388c7f63441d4f122aa4c667a5eef93f22cb748b7aca0bfae2b034' + '43899df58e2e21adcf08ed686cfa26e793ba1e4b376dd917cba4c1e34e7214bd' + 'b91477ef6706a693ea01e2dc15a7b826b6ae89be8182f91a6817d2fb95cbdb72') + +prepare() { + cd "$srcdir/$pkgbase-src" + + sed \ + -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ + -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ + -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ + -i src/osdep/unix/Makefile + + patch -p1 -i "$srcdir/c-client-2006k_GENTOO_amd64-so-fix.patch" +} + +build() { + cd "$srcdir/$pkgbase-src" + CFLAGS+=" -ffat-lto-objects" + # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd + + yes "y" | make lnp EXTRAAUTHENTICATORS=gss PASSWDTYPE=pam SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lpam" EXTRALDFLAGS="${LDFLAGS}" + +} + +package_imap() { + pkgdesc="An IMAP/POP server" + depends=('c-client') + provides=('imap-server' 'pop3-server') + conflicts=('courier-mta' 'courier-imap') + backup=(etc/xinetd.d/{imap,ipop2,ipop3}) + install=imap.install + + cd "$srcdir/$pkgbase-src" + install -d "$pkgdir/usr/bin" + install -D -m755 imapd/imapd "$pkgdir/usr/bin/imapd" + install -D -m755 ipopd/ipop2d "$pkgdir/usr/bin/ipop2d" + install -D -m755 ipopd/ipop3d "$pkgdir/usr/bin/ipop3d" + + # install xinetd.d configs + install -D -m644 ../imap "$pkgdir/etc/xinetd.d/imap" + install -D -m644 ../ipop2 "$pkgdir/etc/xinetd.d/ipop2" + install -D -m644 ../ipop3 "$pkgdir/etc/xinetd.d/ipop3" +} + +package_c-client() { + pkgdesc="Imap client library" + depends=('pam') + + cd "$srcdir/$pkgbase-src" + + for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ + osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do + install -D -m644 c-client/${i}.h "$pkgdir/usr/include/imap/${i}.h" + done + install -m644 c-client/linkage.c "$pkgdir/usr/include/imap/linkage.c" + install -D -m644 c-client/c-client.a "$pkgdir/usr/lib/c-client.a" + ln -sf c-client.a "$pkgdir/usr/lib/libc-client.a" + + install -D -m755 c-client/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1.0.0" + ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1" + ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so" +} Deleted: c-client-2006k_GENTOO_amd64-so-fix.patch =================================================================== --- c-client-2006k_GENTOO_amd64-so-fix.patch 2021-12-26 09:20:58 UTC (rev 433120) +++ c-client-2006k_GENTOO_amd64-so-fix.patch 2021-12-26 09:21:13 UTC (rev 433121) @@ -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) Copied: imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch (from rev 433120, imap/trunk/c-client-2006k_GENTOO_amd64-so-fix.patch) =================================================================== --- c-client-2006k_GENTOO_amd64-so-fix.patch (rev 0) +++ c-client-2006k_GENTOO_amd64-so-fix.patch 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,13 @@ +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) Deleted: imap =================================================================== --- imap 2021-12-26 09:20:58 UTC (rev 433120) +++ imap 2021-12-26 09:21:13 UTC (rev 433121) @@ -1,10 +0,0 @@ -service imap2 -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/imapd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Copied: imap/repos/extra-x86_64/imap (from rev 433120, imap/trunk/imap) =================================================================== --- imap (rev 0) +++ imap 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,10 @@ +service imap2 +{ + socket_type = stream + wait = no + user = root + server = /usr/bin/imapd + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} Deleted: imap.install =================================================================== --- imap.install 2021-12-26 09:20:58 UTC (rev 433120) +++ imap.install 2021-12-26 09:21:13 UTC (rev 433121) @@ -1,40 +0,0 @@ -post_install() { - if [ ! -e /etc/ssl/certs/imapd.pem ]; then - generate_certificate imapd - fi - if [ ! -e /etc/ssl/certs/ipop3d.pem ]; then - generate_certificate ipop3d - fi -} - -post_upgrade() { - post_install -} - -generate_certificate() { - t=$1 - echo -n "Generating $t certificate..." - - umask 077 - tmpdir=$(mktemp -d) - PEM1="$tmpdir/$t.pem1" - PEM2="$tmpdir/$t.pem2" - cert="$tmpdir/$t.pem" - /usr/bin/openssl req -newkey rsa:4096 -keyout "$PEM1" \ - -nodes -x509 -days 365 -out "$PEM2" >/dev/null 2>&1 << EOF --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -localhost.localdomain -root@localhost.localdomain -EOF - - cat "$PEM1" > "$cert" - echo "" >> "$cert" - cat "$PEM2" >> "$cert" - install -Dm 600 "$cert" -t /etc/ssl/certs - rm -rf "$tmpdir" - echo "done." -} Copied: imap/repos/extra-x86_64/imap.install (from rev 433120, imap/trunk/imap.install) =================================================================== --- imap.install (rev 0) +++ imap.install 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,40 @@ +post_install() { + if [ ! -e /etc/ssl/certs/imapd.pem ]; then + generate_certificate imapd + fi + if [ ! -e /etc/ssl/certs/ipop3d.pem ]; then + generate_certificate ipop3d + fi +} + +post_upgrade() { + post_install +} + +generate_certificate() { + t=$1 + echo -n "Generating $t certificate..." + + umask 077 + tmpdir=$(mktemp -d) + PEM1="$tmpdir/$t.pem1" + PEM2="$tmpdir/$t.pem2" + cert="$tmpdir/$t.pem" + /usr/bin/openssl req -newkey rsa:4096 -keyout "$PEM1" \ + -nodes -x509 -days 365 -out "$PEM2" >/dev/null 2>&1 << EOF +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +localhost.localdomain +root@localhost.localdomain +EOF + + cat "$PEM1" > "$cert" + echo "" >> "$cert" + cat "$PEM2" >> "$cert" + install -Dm 600 "$cert" -t /etc/ssl/certs + rm -rf "$tmpdir" + echo "done." +} Deleted: ipop2 =================================================================== --- ipop2 2021-12-26 09:20:58 UTC (rev 433120) +++ ipop2 2021-12-26 09:21:13 UTC (rev 433121) @@ -1,10 +0,0 @@ -service pop2 -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/ipop2d - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Copied: imap/repos/extra-x86_64/ipop2 (from rev 433120, imap/trunk/ipop2) =================================================================== --- ipop2 (rev 0) +++ ipop2 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,10 @@ +service pop2 +{ + socket_type = stream + wait = no + user = root + server = /usr/bin/ipop2d + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} Deleted: ipop3 =================================================================== --- ipop3 2021-12-26 09:20:58 UTC (rev 433120) +++ ipop3 2021-12-26 09:21:13 UTC (rev 433121) @@ -1,10 +0,0 @@ -service pop3 -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/ipop3d - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Copied: imap/repos/extra-x86_64/ipop3 (from rev 433120, imap/trunk/ipop3) =================================================================== --- ipop3 (rev 0) +++ ipop3 2021-12-26 09:21:13 UTC (rev 433121) @@ -0,0 +1,10 @@ +service pop3 +{ + socket_type = stream + wait = no + user = root + server = /usr/bin/ipop3d + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +}