Date: Tuesday, June 18, 2013 @ 11:22:57 Author: lfleischer Revision: 92897
archrelease: copy trunk to community-i686, community-x86_64 Added: stunnel/repos/community-i686/Makefile.patch (from rev 92896, stunnel/trunk/Makefile.patch) stunnel/repos/community-i686/PKGBUILD (from rev 92896, stunnel/trunk/PKGBUILD) stunnel/repos/community-i686/stunnel.install (from rev 92896, stunnel/trunk/stunnel.install) stunnel/repos/community-i686/stunnel.tmpfiles.conf (from rev 92896, stunnel/trunk/stunnel.tmpfiles.conf) stunnel/repos/community-x86_64/Makefile.patch (from rev 92896, stunnel/trunk/Makefile.patch) stunnel/repos/community-x86_64/PKGBUILD (from rev 92896, stunnel/trunk/PKGBUILD) stunnel/repos/community-x86_64/stunnel.install (from rev 92896, stunnel/trunk/stunnel.install) stunnel/repos/community-x86_64/stunnel.tmpfiles.conf (from rev 92896, stunnel/trunk/stunnel.tmpfiles.conf) Deleted: stunnel/repos/community-i686/Makefile.patch stunnel/repos/community-i686/PKGBUILD stunnel/repos/community-i686/stunnel.install stunnel/repos/community-i686/stunnel.tmpfiles.conf stunnel/repos/community-x86_64/Makefile.patch stunnel/repos/community-x86_64/PKGBUILD stunnel/repos/community-x86_64/stunnel.install stunnel/repos/community-x86_64/stunnel.tmpfiles.conf ----------------------------------------+ /Makefile.patch | 42 ++++++++++ /PKGBUILD | 122 +++++++++++++++++++++++++++++++ /stunnel.install | 62 +++++++++++++++ /stunnel.tmpfiles.conf | 2 community-i686/Makefile.patch | 21 ----- community-i686/PKGBUILD | 59 -------------- community-i686/stunnel.install | 31 ------- community-i686/stunnel.tmpfiles.conf | 1 community-x86_64/Makefile.patch | 21 ----- community-x86_64/PKGBUILD | 59 -------------- community-x86_64/stunnel.install | 31 ------- community-x86_64/stunnel.tmpfiles.conf | 1 12 files changed, 228 insertions(+), 224 deletions(-) Deleted: community-i686/Makefile.patch =================================================================== --- community-i686/Makefile.patch 2013-06-18 09:22:41 UTC (rev 92896) +++ community-i686/Makefile.patch 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,21 +0,0 @@ ---- tools/Makefile.in 2010-03-31 04:45:09.000000000 -0500 -+++ tools/Makefile.in 2010-04-11 17:17:41.000000000 -0500 -@@ -334,8 +334,7 @@ - - info-am: - --install-data-am: install-confDATA install-data-local \ -- install-examplesDATA -+install-data-am: install-confDATA install-examplesDATA - - install-dvi: install-dvi-am - -@@ -377,7 +376,7 @@ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-confDATA install-data install-data-am \ -- install-data-local install-dvi install-dvi-am \ -+ install-dvi install-dvi-am \ - install-examplesDATA install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ Copied: stunnel/repos/community-i686/Makefile.patch (from rev 92896, stunnel/trunk/Makefile.patch) =================================================================== --- community-i686/Makefile.patch (rev 0) +++ community-i686/Makefile.patch 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,21 @@ +--- tools/Makefile.in 2010-03-31 04:45:09.000000000 -0500 ++++ tools/Makefile.in 2010-04-11 17:17:41.000000000 -0500 +@@ -334,8 +334,7 @@ + + info-am: + +-install-data-am: install-confDATA install-data-local \ +- install-examplesDATA ++install-data-am: install-confDATA install-examplesDATA + + install-dvi: install-dvi-am + +@@ -377,7 +376,7 @@ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-confDATA install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ ++ install-dvi install-dvi-am \ + install-examplesDATA install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-06-18 09:22:41 UTC (rev 92896) +++ community-i686/PKGBUILD 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,59 +0,0 @@ -# $Id$ -# Maintainer: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Kevin Piche <ke...@archlinux.org> - -pkgname=stunnel -pkgver=4.56 -pkgrel=2 -pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" -arch=('i686' 'x86_64') -url="http://www.stunnel.org" -license=('GPL') -depends=('openssl') -install=$pkgname.install -options=('!libtool') -source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} - 'Makefile.patch' - 'stunnel.tmpfiles.conf') - -md5sums=('ac4c4a30bd7a55b6687cbd62d864054c' - 'd68c7dd65d515c678cdde15bbf0ce344' - 'f15398497e10e080c2406d2fc541660c' - '2e065a39998e57727ee79887bbd1751e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # don't create a certificate... - patch -p0 < "$srcdir/Makefile.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-ipv6 \ - --disable-libwrap - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - for i in ca.pl importCA.sh; do - install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" - done - - install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" - install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" - - # move systemd service into place - install -dm755 "$pkgdir/usr/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" - - sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ - -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ - -e "s:no\(body\|group\):stunnel:g" \ - -i "$pkgdir/etc/stunnel/stunnel.conf-sample" -} Copied: stunnel/repos/community-i686/PKGBUILD (from rev 92896, stunnel/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Kevin Piche <ke...@archlinux.org> + +pkgname=stunnel +pkgver=4.56 +pkgrel=3 +pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" +arch=('i686' 'x86_64') +url="http://www.stunnel.org" +license=('GPL') +depends=('openssl') +install=$pkgname.install +options=('!libtool') +source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} + 'Makefile.patch' + 'stunnel.tmpfiles.conf') + +md5sums=('ac4c4a30bd7a55b6687cbd62d864054c' + 'd68c7dd65d515c678cdde15bbf0ce344' + 'f15398497e10e080c2406d2fc541660c' + '2e065a39998e57727ee79887bbd1751e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # don't create a certificate... + patch -p0 < "$srcdir/Makefile.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-ipv6 \ + --disable-libwrap \ + --disable-fips + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + for i in ca.pl importCA.sh; do + install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" + done + + install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" + install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" + + # move systemd service into place + install -dm755 "$pkgdir/usr/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" + + sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ + -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ + -e "s:no\(body\|group\):stunnel:g" \ + -i "$pkgdir/etc/stunnel/stunnel.conf-sample" +} Deleted: community-i686/stunnel.install =================================================================== --- community-i686/stunnel.install 2013-06-18 09:22:41 UTC (rev 92896) +++ community-i686/stunnel.install 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,31 +0,0 @@ -post_install() { - # add stunnel group - if ! getent group stunnel >/dev/null 2>&1; then - groupadd -g 16 stunnel - fi - - # add stunnel user - if ! getent passwd stunnel >/dev/null 2>&1; then - useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel - fi - - # create chroot dir if necessary. - if [ ! -d /var/run/stunnel ]; then - install -dm770 -o stunnel -g stunnel /var/run/stunnel - fi -} - -post_upgrade() { - post_install "$@" -} - -pre_remove() { - # remove users & groups - if getent passwd stunnel >/dev/null 2>&1; then - userdel stunnel - fi - - if getent group stunnel >/dev/null 2>&1; then - groupdel stunnel - fi -} Copied: stunnel/repos/community-i686/stunnel.install (from rev 92896, stunnel/trunk/stunnel.install) =================================================================== --- community-i686/stunnel.install (rev 0) +++ community-i686/stunnel.install 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,31 @@ +post_install() { + # add stunnel group + if ! getent group stunnel >/dev/null 2>&1; then + groupadd -g 16 stunnel + fi + + # add stunnel user + if ! getent passwd stunnel >/dev/null 2>&1; then + useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel + fi + + # create chroot dir if necessary. + if [ ! -d /var/run/stunnel ]; then + install -dm770 -o stunnel -g stunnel /var/run/stunnel + fi +} + +post_upgrade() { + post_install "$@" +} + +pre_remove() { + # remove users & groups + if getent passwd stunnel >/dev/null 2>&1; then + userdel stunnel + fi + + if getent group stunnel >/dev/null 2>&1; then + groupdel stunnel + fi +} Deleted: community-i686/stunnel.tmpfiles.conf =================================================================== --- community-i686/stunnel.tmpfiles.conf 2013-06-18 09:22:41 UTC (rev 92896) +++ community-i686/stunnel.tmpfiles.conf 2013-06-18 09:22:57 UTC (rev 92897) @@ -1 +0,0 @@ -d /var/run/stunnel 0770 stunnel stunnel - Copied: stunnel/repos/community-i686/stunnel.tmpfiles.conf (from rev 92896, stunnel/trunk/stunnel.tmpfiles.conf) =================================================================== --- community-i686/stunnel.tmpfiles.conf (rev 0) +++ community-i686/stunnel.tmpfiles.conf 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1 @@ +d /var/run/stunnel 0770 stunnel stunnel - Deleted: community-x86_64/Makefile.patch =================================================================== --- community-x86_64/Makefile.patch 2013-06-18 09:22:41 UTC (rev 92896) +++ community-x86_64/Makefile.patch 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,21 +0,0 @@ ---- tools/Makefile.in 2010-03-31 04:45:09.000000000 -0500 -+++ tools/Makefile.in 2010-04-11 17:17:41.000000000 -0500 -@@ -334,8 +334,7 @@ - - info-am: - --install-data-am: install-confDATA install-data-local \ -- install-examplesDATA -+install-data-am: install-confDATA install-examplesDATA - - install-dvi: install-dvi-am - -@@ -377,7 +376,7 @@ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-confDATA install-data install-data-am \ -- install-data-local install-dvi install-dvi-am \ -+ install-dvi install-dvi-am \ - install-examplesDATA install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ Copied: stunnel/repos/community-x86_64/Makefile.patch (from rev 92896, stunnel/trunk/Makefile.patch) =================================================================== --- community-x86_64/Makefile.patch (rev 0) +++ community-x86_64/Makefile.patch 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,21 @@ +--- tools/Makefile.in 2010-03-31 04:45:09.000000000 -0500 ++++ tools/Makefile.in 2010-04-11 17:17:41.000000000 -0500 +@@ -334,8 +334,7 @@ + + info-am: + +-install-data-am: install-confDATA install-data-local \ +- install-examplesDATA ++install-data-am: install-confDATA install-examplesDATA + + install-dvi: install-dvi-am + +@@ -377,7 +376,7 @@ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-confDATA install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ ++ install-dvi install-dvi-am \ + install-examplesDATA install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-06-18 09:22:41 UTC (rev 92896) +++ community-x86_64/PKGBUILD 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,59 +0,0 @@ -# $Id$ -# Maintainer: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Kevin Piche <ke...@archlinux.org> - -pkgname=stunnel -pkgver=4.56 -pkgrel=2 -pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" -arch=('i686' 'x86_64') -url="http://www.stunnel.org" -license=('GPL') -depends=('openssl') -install=$pkgname.install -options=('!libtool') -source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} - 'Makefile.patch' - 'stunnel.tmpfiles.conf') - -md5sums=('ac4c4a30bd7a55b6687cbd62d864054c' - 'd68c7dd65d515c678cdde15bbf0ce344' - 'f15398497e10e080c2406d2fc541660c' - '2e065a39998e57727ee79887bbd1751e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # don't create a certificate... - patch -p0 < "$srcdir/Makefile.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-ipv6 \ - --disable-libwrap - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - for i in ca.pl importCA.sh; do - install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" - done - - install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" - install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" - - # move systemd service into place - install -dm755 "$pkgdir/usr/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" - - sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ - -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ - -e "s:no\(body\|group\):stunnel:g" \ - -i "$pkgdir/etc/stunnel/stunnel.conf-sample" -} Copied: stunnel/repos/community-x86_64/PKGBUILD (from rev 92896, stunnel/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Kevin Piche <ke...@archlinux.org> + +pkgname=stunnel +pkgver=4.56 +pkgrel=3 +pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" +arch=('i686' 'x86_64') +url="http://www.stunnel.org" +license=('GPL') +depends=('openssl') +install=$pkgname.install +options=('!libtool') +source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} + 'Makefile.patch' + 'stunnel.tmpfiles.conf') + +md5sums=('ac4c4a30bd7a55b6687cbd62d864054c' + 'd68c7dd65d515c678cdde15bbf0ce344' + 'f15398497e10e080c2406d2fc541660c' + '2e065a39998e57727ee79887bbd1751e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # don't create a certificate... + patch -p0 < "$srcdir/Makefile.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-ipv6 \ + --disable-libwrap \ + --disable-fips + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + for i in ca.pl importCA.sh; do + install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" + done + + install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" + install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" + + # move systemd service into place + install -dm755 "$pkgdir/usr/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" + + sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ + -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ + -e "s:no\(body\|group\):stunnel:g" \ + -i "$pkgdir/etc/stunnel/stunnel.conf-sample" +} Deleted: community-x86_64/stunnel.install =================================================================== --- community-x86_64/stunnel.install 2013-06-18 09:22:41 UTC (rev 92896) +++ community-x86_64/stunnel.install 2013-06-18 09:22:57 UTC (rev 92897) @@ -1,31 +0,0 @@ -post_install() { - # add stunnel group - if ! getent group stunnel >/dev/null 2>&1; then - groupadd -g 16 stunnel - fi - - # add stunnel user - if ! getent passwd stunnel >/dev/null 2>&1; then - useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel - fi - - # create chroot dir if necessary. - if [ ! -d /var/run/stunnel ]; then - install -dm770 -o stunnel -g stunnel /var/run/stunnel - fi -} - -post_upgrade() { - post_install "$@" -} - -pre_remove() { - # remove users & groups - if getent passwd stunnel >/dev/null 2>&1; then - userdel stunnel - fi - - if getent group stunnel >/dev/null 2>&1; then - groupdel stunnel - fi -} Copied: stunnel/repos/community-x86_64/stunnel.install (from rev 92896, stunnel/trunk/stunnel.install) =================================================================== --- community-x86_64/stunnel.install (rev 0) +++ community-x86_64/stunnel.install 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1,31 @@ +post_install() { + # add stunnel group + if ! getent group stunnel >/dev/null 2>&1; then + groupadd -g 16 stunnel + fi + + # add stunnel user + if ! getent passwd stunnel >/dev/null 2>&1; then + useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel + fi + + # create chroot dir if necessary. + if [ ! -d /var/run/stunnel ]; then + install -dm770 -o stunnel -g stunnel /var/run/stunnel + fi +} + +post_upgrade() { + post_install "$@" +} + +pre_remove() { + # remove users & groups + if getent passwd stunnel >/dev/null 2>&1; then + userdel stunnel + fi + + if getent group stunnel >/dev/null 2>&1; then + groupdel stunnel + fi +} Deleted: community-x86_64/stunnel.tmpfiles.conf =================================================================== --- community-x86_64/stunnel.tmpfiles.conf 2013-06-18 09:22:41 UTC (rev 92896) +++ community-x86_64/stunnel.tmpfiles.conf 2013-06-18 09:22:57 UTC (rev 92897) @@ -1 +0,0 @@ -d /var/run/stunnel 0770 stunnel stunnel - Copied: stunnel/repos/community-x86_64/stunnel.tmpfiles.conf (from rev 92896, stunnel/trunk/stunnel.tmpfiles.conf) =================================================================== --- community-x86_64/stunnel.tmpfiles.conf (rev 0) +++ community-x86_64/stunnel.tmpfiles.conf 2013-06-18 09:22:57 UTC (rev 92897) @@ -0,0 +1 @@ +d /var/run/stunnel 0770 stunnel stunnel -