Date: Wednesday, January 17, 2018 @ 16:03:26 Author: spupykin Revision: 283733
archrelease: copy trunk to community-x86_64 Added: inn/repos/community-x86_64/PKGBUILD (from rev 283732, inn/trunk/PKGBUILD) inn/repos/community-x86_64/inn.install (from rev 283732, inn/trunk/inn.install) inn/repos/community-x86_64/inn.sysusers (from rev 283732, inn/trunk/inn.sysusers) inn/repos/community-x86_64/inn.tmpfiles (from rev 283732, inn/trunk/inn.tmpfiles) inn/repos/community-x86_64/innd.service (from rev 283732, inn/trunk/innd.service) Deleted: inn/repos/community-x86_64/PKGBUILD inn/repos/community-x86_64/inn.install inn/repos/community-x86_64/inn.tmpfiles inn/repos/community-x86_64/innd.service inn/repos/community-x86_64/site.make.patch -----------------+ PKGBUILD | 282 ++++++++++++++++++++++++++---------------------------- inn.install | 41 +++---- inn.sysusers | 3 inn.tmpfiles | 2 innd.service | 32 +++--- site.make.patch | 32 ------ 6 files changed, 177 insertions(+), 215 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-17 16:03:07 UTC (rev 283732) +++ PKGBUILD 2018-01-17 16:03:26 UTC (rev 283733) @@ -1,144 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Edward Tjörnhammar <xh...@cube2.se> -# Contributor: Edward Tjörnhammar <xh...@cube2.se> - -pkgname=inn -pkgver=2.6.1 -pkgrel=5 -pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." -url="http://www.isc.org/software/inn/" -arch=('i686' 'x86_64') -license=("custom:INN") -depends=('openssl' 'perl-mime-tools') -makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl') -optdepends=('python2' 'libsasl') -options=(emptydirs docs zipman) -install=inn.install -backup=(etc/inn/innwatch.ctl - etc/inn/innfeed.conf - etc/inn/moderators - etc/inn/news2mail.cf - etc/inn/innshellvars.tcl.local - etc/inn/buffindexed.conf - etc/inn/newsfeeds - etc/inn/storage.conf - etc/inn/innshellvars.local - etc/inn/inn-radius.conf - etc/inn/nntpsend.ctl - etc/inn/passwd.nntp - etc/inn/send-uucp.cf - etc/inn/cycbuff.conf - etc/inn/incoming.conf - etc/inn/control.ctl.local - etc/inn/actsync.ign - etc/inn/motd.innd.sample - etc/inn/distributions - etc/inn/innshellvars.pl.local - etc/inn/readers.conf - etc/inn/innreport.conf - etc/inn/actsync.cfg - etc/inn/nocem.ctl - etc/inn/control.ctl - etc/inn/subscriptions - etc/inn/motd.nnrpd.sample - etc/inn/inn.conf - etc/inn/ovdb.conf - etc/inn/localgroups - etc/inn/nnrpd.track - etc/inn/distrib.pats - etc/inn/expire.ctl - var/db/inn/active - var/db/inn/active.times - var/db/inn/history - var/db/inn/history.dir - var/db/inn/history.hash - var/db/inn/history.index - var/db/inn/newsgroups) -validpgpkeys=('E784364E8DDE7BB370FBD9EAD15D313882004173') -source=(https://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz{,.asc} - innd.service - inn.tmpfiles - site.make.patch) -sha256sums=('50f03516d39922f5c4db68915d2a70c8d5ffe8c14a16ba01029c148700523bda' - 'SKIP' - 'b8658c900f5bce5d0b09b595496137e5f3e93bbcdc1fb1f751783e6e2873de21' - 'f58a06718396628bf110de21c052cf29c0d2e7bd0c7bd645d43b592b6ac549d4' - '66cc0532702177b9554d7864bde28997937c75047716f2bac5feda25594b3818') - -prepare() { - cd "$srcdir"/inn-$pkgver -# sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global -# [ $NOEXTRACT -eq 1 ] || patch -p3 < "$srcdir"/site.make.patch -# sed -i 's|#define L_NOTICE.*|#define L_NOTICE LOG_NOTICE|' include/inn/options.h -} - -build() { - cd "$srcdir"/inn-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --includedir=/usr/include/inn \ - --sbindir=/usr/sbin \ - --with-libtool \ - --with-gnu-id \ - --with-db-dir=/var/db/inn \ - --sysconfdir=/etc/inn \ - --with-spool-dir=/var/spool/news \ - --with-log-dir=/var/log/inn \ - --with-run-dir=/var/run/inn \ - --with-tmp-dir=/var/spool/inn/tmp \ - --enable-largefiles \ - --with-openssl=/usr \ - --with-perl \ - --with-python \ - --with-sendmail=/usr/bin/msmtp \ - --with-sasl=/usr \ - --with-news-user=9 \ - --with-news-group=13 - # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database - test -f include/config.h - cat >>include/config.h <<EOF -#undef RUNASUSER -#define RUNASUSER "news" -#undef RUNASGROUP -#define RUNASGROUP "news" -EOF - make -} - -package() { - cd "$srcdir"/inn-$pkgver - export LD_LIBRARY_PATH=.:"$pkgdir"/usr/lib:$LD_LIBRARY_PATH - - make DESTDIR="$pkgdir" install - - cd "$pkgdir"/usr/lib - for i in lib*.a; do - gcc -shared -o ${i%%.a}.so.2.0.0 $i - for j in 2.0 2; do - ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j - done - done - - touch "$pkgdir"/var/db/inn/history{.dir,.hash,.index,} - - mkdir -p "$pkgdir"/usr/share/doc/inn "$pkgdir"/usr/share/inn/ - mv "$pkgdir"/usr/share/man/man3/list.3 "$pkgdir"/usr/share/man/man3/list-inn.3 - mv "$pkgdir"/usr/doc/* "$pkgdir"/usr/share/doc/inn/ - mv "$pkgdir"/usr/http/* "$pkgdir"/usr/share/inn/ - mv "$pkgdir"/usr/bin/archive "$pkgdir"/usr/bin/archive.inn - rm -rf "$pkgdir"/usr/doc "$pkgdir"/usr/http "$pkgdir"/var/run - install -D -m0644 "$srcdir"/inn-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/inn/LICENSE - chown root:root "$pkgdir"/usr/bin/innbind - chmod 05555 "$pkgdir"/usr/bin/innbind - - install -Dm0644 "$srcdir"/innd.service "$pkgdir"/usr/lib/systemd/system/innd.service - install -Dm0644 "$srcdir"/inn.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/inn.conf - -# template start; name=perl-binary-module-dependency; version=1; -if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then - _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);') - _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);') - depends+=("perl>=$_perlver_min" "perl<$_perlver_max") -fi -# template end; -} Copied: inn/repos/community-x86_64/PKGBUILD (from rev 283732, inn/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-17 16:03:26 UTC (rev 283733) @@ -0,0 +1,138 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Edward Tjörnhammar <xh...@cube2.se> +# Contributor: Edward Tjörnhammar <xh...@cube2.se> + +pkgname=inn +pkgver=2.6.1 +pkgrel=6 +pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." +url="http://www.isc.org/software/inn/" +arch=('x86_64') +license=("custom:INN") +depends=('openssl' 'perl-mime-tools') +makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl') +optdepends=('python2' 'libsasl') +options=(emptydirs docs zipman) +install=inn.install +backup=(etc/inn/innwatch.ctl + etc/inn/innfeed.conf + etc/inn/moderators + etc/inn/news2mail.cf + etc/inn/innshellvars.tcl.local + etc/inn/buffindexed.conf + etc/inn/newsfeeds + etc/inn/storage.conf + etc/inn/innshellvars.local + etc/inn/inn-radius.conf + etc/inn/nntpsend.ctl + etc/inn/passwd.nntp + etc/inn/send-uucp.cf + etc/inn/cycbuff.conf + etc/inn/incoming.conf + etc/inn/control.ctl.local + etc/inn/actsync.ign + etc/inn/motd.innd.sample + etc/inn/distributions + etc/inn/innshellvars.pl.local + etc/inn/readers.conf + etc/inn/innreport.conf + etc/inn/actsync.cfg + etc/inn/nocem.ctl + etc/inn/control.ctl + etc/inn/subscriptions + etc/inn/motd.nnrpd.sample + etc/inn/inn.conf + etc/inn/ovdb.conf + etc/inn/localgroups + etc/inn/nnrpd.track + etc/inn/distrib.pats + etc/inn/expire.ctl + var/db/inn/active + var/db/inn/active.times + var/db/inn/history + var/db/inn/history.dir + var/db/inn/history.hash + var/db/inn/history.index + var/db/inn/newsgroups) +validpgpkeys=('E784364E8DDE7BB370FBD9EAD15D313882004173') +source=(https://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz{,.asc} + innd.service + inn.tmpfiles + inn.sysusers) +sha256sums=('50f03516d39922f5c4db68915d2a70c8d5ffe8c14a16ba01029c148700523bda' + 'SKIP' + 'b8658c900f5bce5d0b09b595496137e5f3e93bbcdc1fb1f751783e6e2873de21' + 'f58a06718396628bf110de21c052cf29c0d2e7bd0c7bd645d43b592b6ac549d4' + 'a8c269bc006eb39a140af1538a0812c54ea11f444867c28f5e9792bfdd4df71a') + +build() { + cd "$srcdir"/inn-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --includedir=/usr/include/inn \ + --sbindir=/usr/sbin \ + --with-libtool \ + --with-gnu-id \ + --with-db-dir=/var/db/inn \ + --sysconfdir=/etc/inn \ + --with-spool-dir=/var/spool/news \ + --with-log-dir=/var/log/inn \ + --with-run-dir=/var/run/inn \ + --with-tmp-dir=/var/spool/inn/tmp \ + --enable-largefiles \ + --with-openssl=/usr \ + --with-perl \ + --with-python \ + --with-sendmail=/usr/bin/msmtp \ + --with-sasl=/usr \ + --with-news-user=9 \ + --with-news-group=13 + # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database + test -f include/config.h + cat >>include/config.h <<EOF +#undef RUNASUSER +#define RUNASUSER "news" +#undef RUNASGROUP +#define RUNASGROUP "news" +EOF + make +} + +package() { + cd "$srcdir"/inn-$pkgver + export LD_LIBRARY_PATH=.:"$pkgdir"/usr/lib:$LD_LIBRARY_PATH + + make DESTDIR="$pkgdir" install + + cd "$pkgdir"/usr/lib + for i in lib*.a; do + gcc -shared -o ${i%%.a}.so.2.0.0 $i + for j in 2.0 2; do + ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j + done + done + + touch "$pkgdir"/var/db/inn/history{.dir,.hash,.index,} + + mkdir -p "$pkgdir"/usr/share/doc/inn "$pkgdir"/usr/share/inn/ + mv "$pkgdir"/usr/share/man/man3/list.3 "$pkgdir"/usr/share/man/man3/list-inn.3 + mv "$pkgdir"/usr/doc/* "$pkgdir"/usr/share/doc/inn/ + mv "$pkgdir"/usr/http/* "$pkgdir"/usr/share/inn/ + mv "$pkgdir"/usr/bin/archive "$pkgdir"/usr/bin/archive.inn + rm -rf "$pkgdir"/usr/doc "$pkgdir"/usr/http "$pkgdir"/var/run + install -D -m0644 "$srcdir"/inn-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/inn/LICENSE + chown root:root "$pkgdir"/usr/bin/innbind + chmod 05555 "$pkgdir"/usr/bin/innbind + + install -Dm0644 "$srcdir"/innd.service "$pkgdir"/usr/lib/systemd/system/innd.service + install -Dm0644 "$srcdir"/inn.sysusers "$pkgdir"/usr/lib/sysusers.d/inn.conf + install -Dm0644 "$srcdir"/inn.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/inn.conf + +# template start; name=perl-binary-module-dependency; version=1; +if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then + _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);') + _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);') + depends+=("perl>=$_perlver_min" "perl<$_perlver_max") +fi +# template end; +} Deleted: inn.install =================================================================== --- inn.install 2018-01-17 16:03:07 UTC (rev 283732) +++ inn.install 2018-01-17 16:03:26 UTC (rev 283733) @@ -1,22 +0,0 @@ -post_install() { - grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- - grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- - - /usr/bin/makedbz -i -o 2>&- >&- - mkdir /var/log/news 2>&- >&- - - chown news:news -R var/spool/news 2>&- >&- - chown news:news var/log/news 2>&- >&- - chown news:news -R var/db/inn 2>&- >&- - - echo "" - echo "->" - echo "-> If this is a first-time installation, a minimal active file and" - echo "-> history database have been installed. Do not forget to update" - echo "-> your cron entries and configure INN. See INSTALL for more" - echo "-> information." - echo "->" - echo "-> The default user:group for inn is news:news" - echo "->" - echo "" -} Copied: inn/repos/community-x86_64/inn.install (from rev 283732, inn/trunk/inn.install) =================================================================== --- inn.install (rev 0) +++ inn.install 2018-01-17 16:03:26 UTC (rev 283733) @@ -0,0 +1,19 @@ +post_install() { + /usr/bin/makedbz -i -o 2>&- >&- + mkdir /var/log/news 2>&- >&- + + chown 9:13 -R var/spool/news 2>&- >&- + chown 9:13 var/log/news 2>&- >&- + chown 9:13 -R var/db/inn 2>&- >&- + + echo "" + echo "->" + echo "-> If this is a first-time installation, a minimal active file and" + echo "-> history database have been installed. Do not forget to update" + echo "-> your cron entries and configure INN. See INSTALL for more" + echo "-> information." + echo "->" + echo "-> The default user:group for inn is news:news" + echo "->" + echo "" +} Copied: inn/repos/community-x86_64/inn.sysusers (from rev 283732, inn/trunk/inn.sysusers) =================================================================== --- inn.sysusers (rev 0) +++ inn.sysusers 2018-01-17 16:03:26 UTC (rev 283733) @@ -0,0 +1,3 @@ +g news 13 - +u news 9 - /var/spool/news +m news news Deleted: inn.tmpfiles =================================================================== --- inn.tmpfiles 2018-01-17 16:03:07 UTC (rev 283732) +++ inn.tmpfiles 2018-01-17 16:03:26 UTC (rev 283733) @@ -1 +0,0 @@ -d /run/inn 0755 news news - Copied: inn/repos/community-x86_64/inn.tmpfiles (from rev 283732, inn/trunk/inn.tmpfiles) =================================================================== --- inn.tmpfiles (rev 0) +++ inn.tmpfiles 2018-01-17 16:03:26 UTC (rev 283733) @@ -0,0 +1 @@ +d /run/inn 0755 news news - Deleted: innd.service =================================================================== --- innd.service 2018-01-17 16:03:07 UTC (rev 283732) +++ innd.service 2018-01-17 16:03:26 UTC (rev 283733) @@ -1,16 +0,0 @@ -[Unit] -Description=Inetnet News Daemon -After=syslog.target network.target -ConditionPathExists=/etc/inn/inn.conf - -[Service] -User=news -PermissionsStartOnly=true -PIDFile=/run/inn/innd.pid -Type=forking -ExecStart=/usr/bin/rc.news -ExecStop=/bin/su -m news -c '/usr/bin/rc.news stop' -KillMode=control-group - -[Install] -WantedBy=multi-user.target Copied: inn/repos/community-x86_64/innd.service (from rev 283732, inn/trunk/innd.service) =================================================================== --- innd.service (rev 0) +++ innd.service 2018-01-17 16:03:26 UTC (rev 283733) @@ -0,0 +1,16 @@ +[Unit] +Description=Inetnet News Daemon +After=syslog.target network.target +ConditionPathExists=/etc/inn/inn.conf + +[Service] +User=news +PermissionsStartOnly=true +PIDFile=/run/inn/innd.pid +Type=forking +ExecStart=/usr/bin/rc.news +ExecStop=/bin/su -m news -c '/usr/bin/rc.news stop' +KillMode=control-group + +[Install] +WantedBy=multi-user.target Deleted: site.make.patch =================================================================== --- site.make.patch 2018-01-17 16:03:07 UTC (rev 283732) +++ site.make.patch 2018-01-17 16:03:26 UTC (rev 283733) @@ -1,32 +0,0 @@ ---- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200 -+++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200 -@@ -52,7 +52,6 @@ - - PATH_ACTIVE = ${PATHDB}/active - PATH_ACTIVE_TIMES = ${PATHDB}/active.times --PATH_HISTORY = ${PATHDB}/history - PATH_NEWSGROUPS = ${PATHDB}/newsgroups - - ## Scripts from above, plus site-specific config files. -@@ -98,7 +97,7 @@ - ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) - - SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ -- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) -+ $D$(PATH_NEWSGROUPS) - - ## Get new versions of everything from samples directory. - all: $(ALL) config -@@ -143,12 +142,6 @@ - chown $(RUNASUSER) $@ - chgrp $(RUNASGROUP) $@ - chmod $(FILEMODE) $@ --$D$(PATH_HISTORY): -- touch $@ -- chown $(RUNASUSER) $@ -- chgrp $(RUNASGROUP) $@ -- chmod $(FILEMODE) $@ -- test -z "$D" && $(PATHBIN)/makedbz -i -o - - bootstrap: -