[Gsrc-commit] /srv/bzr/gsrc/trunk r1252: clean up userv and fix install

[Brandon Invergo]

------------------------------------------------------------
revno: 1252
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 19:49:01 +0100
message:
  clean up userv and fix install
added:
  gnu/userv/config.mk
  gnu/userv/files/
  gnu/userv/files/userv-1.0.5-fix-install.diff
modified:
  gnu/userv/Makefile
  gnu/userv/sha256sums

=== modified file 'gnu/userv/Makefile'
--- a/gnu/userv/Makefile        2010-06-11 09:29:17 +0000
+++ b/gnu/userv/Makefile        2012-11-21 18:49:01 +0000
@@ -1,16 +1,22 @@
 GARNAME = userv
 GARVERSION = 1.0.5
+HOME_URL = http://www.gnu.org/software/userv/
+DESCRIPTION = A security boundary tool
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = userv/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/userv/
-DESCRIPTION = userv - security boundary tool
+PATCHFILES = $(DISTNAME)-fix-install.diff
+
+BUILDDEPS = 
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+BUILD_ENV += INSTALL_USER=$(INSTALL_USER) INSTALL_GROUP=$(INSTALL_GROUP)

=== added file 'gnu/userv/config.mk'
--- a/gnu/userv/config.mk       1970-01-01 00:00:00 +0000
+++ b/gnu/userv/config.mk       2012-11-21 18:49:01 +0000
@@ -0,0 +1,7 @@
+## Configuration options for userv ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=
+
+INSTALL_USER=root 
+INSTALL_GROUP=root

=== added directory 'gnu/userv/files'
=== added file 'gnu/userv/files/userv-1.0.5-fix-install.diff'
--- a/gnu/userv/files/userv-1.0.5-fix-install.diff      1970-01-01 00:00:00 
+0000
+++ b/gnu/userv/files/userv-1.0.5-fix-install.diff      2012-11-21 18:49:01 
+0000
@@ -0,0 +1,63 @@
+diff -x config.log -x config.status -ru tmp/userv-1.0.5/Makefile.in 
work/userv-1.0.5/Makefile.in
+--- work/userv-1.0.5/Makefile.in       2006-04-08 14:00:01.000000000 +0200
++++ work/userv-1.0.5/Makefile.in       2012-11-21 19:45:31.871836621 +0100
+@@ -16,6 +16,8 @@
+ #  along with userv; if not, write to the Free Software
+ #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
++DESTDIR = 
++
+ address@hidden@
+ VEREXT=std
+ 
+@@ -32,7 +34,7 @@
+ CWD=$(shell pwd)
+ 
+ INSTALL_GROUP=0  # root or wheel
+-INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
++INSTALL_FLAGS=-o $(INSTALL_USER) -g $(INSTALL_GROUP)
+ 
+ address@hidden@
+ address@hidden@ $(INSTALL_FLAGS)
+@@ -72,25 +74,27 @@
+ docs:         $(TARGETS_DOC)
+ 
+ install:      all
+-              $(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
+-              $(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
+-              $(INSTALL) -d -m 2755 $(etcsubdir) \
+-      $(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
+-              if test ! -f $(etcsubdir)/system.default; then \
+-                      $(INSTALL_DATA) system.default $(etcsubdir); fi
+-              if test ! -f $(etcsubdir)/system.override; then \
+-                      $(INSTALL_DATA) system.override $(etcsubdir); fi
++              $(INSTALL) -d $(DESTDIR)$(sbindir)
++              $(INSTALL) -d $(DESTDIR)$(bindir)
++              $(INSTALL_PROGRAM) -m 755 daemon $(DESTDIR)$(sbindir)/uservd
++              $(INSTALL_PROGRAM) -m 4755 client $(DESTDIR)$(bindir)/userv
++              $(INSTALL) -d -m 2755 $(DESTDIR)$(etcsubdir) \
++      $(DESTDIR)$(etcsubdir)/default.d $(DESTDIR)$(etcsubdir)/services.d 
$(DESTDIR)$(etcsubdir)/override.d
++              if test ! -f $(DESTDIR)$(etcsubdir)/system.default; then \
++                      $(INSTALL_DATA) system.default $(DESTDIR)$(etcsubdir); 
fi
++              if test ! -f $(DESTDIR)$(etcsubdir)/system.override; then \
++                      $(INSTALL_DATA) system.override $(DESTDIR)$(etcsubdir); 
fi
+ 
+ install-strip:
+               $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+ 
+ install-doc:  $(TARGETS_DOC)
+-              $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
+-              $(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
+-              $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
+-              $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+-              $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
+-              $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(man8dir)
++              $(INSTALL) -d -m 2755 $(DESTDIR)$(docdir) 
$(DESTDIR)$(docdir)/spec.html
++              $(INSTALL) -d -m 2755  $(DESTDIR)$(mandir) $(DESTDIR)$(man1dir) 
$(DESTDIR)$(man8dir)
++              $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
++              $(INSTALL_DATA) -m 644 spec.html/*.html 
$(DESTDIR)$(docdir)/spec.html/.
++              $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(DESTDIR)$(man1dir)
++              $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+               rm -f $(bindir)/userv $(sbindir)/uservd

=== modified file 'gnu/userv/sha256sums'
--- a/gnu/userv/sha256sums      2010-06-11 09:39:08 +0000
+++ b/gnu/userv/sha256sums      2012-11-21 18:49:01 +0000
@@ -1,2 +1,3 @@
 70421706c8a4f71ce7bf345f95e713d8d43f482fac7b1e437bbc2a0c46ac9b74  
download/userv-1.0.5.tar.gz
+c1144244f5e183863f4cfbbf3a42d22d8652b11edcff3a3a912c18c774cd0dc9  
download/userv-1.0.5-fix-install.diff
 2f7ba6f54926d09134373869214a240ff3c3d9aedcee0365ca6dd20284575612  
download/userv-1.0.5.tar.gz.sig