[arch-commits] Commit in inn/trunk (PKGBUILD inn.install inn.sysusers site.make.patch)

[Sergej Pupykin]

    Date: Wednesday, January 17, 2018 @ 16:03:07
  Author: spupykin
Revision: 283732

upgpkg: inn 2.6.1-6

Added:
  inn/trunk/inn.sysusers
Modified:
  inn/trunk/PKGBUILD
  inn/trunk/inn.install
Deleted:
  inn/trunk/site.make.patch

-----------------+
 PKGBUILD        |   14 ++++----------
 inn.install     |    9 +++------
 inn.sysusers    |    3 +++
 site.make.patch |   32 --------------------------------
 4 files changed, 10 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-17 15:50:44 UTC (rev 283731)
+++ PKGBUILD	2018-01-17 16:03:07 UTC (rev 283732)
@@ -5,7 +5,7 @@
 
 pkgname=inn
 pkgver=2.6.1
-pkgrel=5
+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')
@@ -59,20 +59,13 @@
 source=(https://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz{,.asc}
 	innd.service
 	inn.tmpfiles
-	site.make.patch)
+	inn.sysusers)
 sha256sums=('50f03516d39922f5c4db68915d2a70c8d5ffe8c14a16ba01029c148700523bda'
             'SKIP'
             'b8658c900f5bce5d0b09b595496137e5f3e93bbcdc1fb1f751783e6e2873de21'
             'f58a06718396628bf110de21c052cf29c0d2e7bd0c7bd645d43b592b6ac549d4'
-            '66cc0532702177b9554d7864bde28997937c75047716f2bac5feda25594b3818')
+            'a8c269bc006eb39a140af1538a0812c54ea11f444867c28f5e9792bfdd4df71a')
 
-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 \
@@ -132,6 +125,7 @@
   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;

Modified: inn.install
===================================================================
--- inn.install	2018-01-17 15:50:44 UTC (rev 283731)
+++ inn.install	2018-01-17 16:03:07 UTC (rev 283732)
@@ -1,13 +1,10 @@
 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>&- >&-
+	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 "->"

Added: inn.sysusers
===================================================================
--- inn.sysusers	                        (rev 0)
+++ inn.sysusers	2018-01-17 16:03:07 UTC (rev 283732)
@@ -0,0 +1,3 @@
+g news 13 -
+u news 9 - /var/spool/news
+m news news

Deleted: site.make.patch
===================================================================
--- site.make.patch	2018-01-17 15:50:44 UTC (rev 283731)
+++ site.make.patch	2018-01-17 16:03:07 UTC (rev 283732)
@@ -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:
-