[Gsrc-commit] /srv/bzr/gsrc/trunk r1109: clean up gnubatch some more

[Brandon Invergo]

------------------------------------------------------------
revno: 1109
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 00:43:38 +0100
message:
  clean up gnubatch some more
modified:
  gnu/gnubatch/Makefile
  gnu/gnubatch/config.mk

=== modified file 'gnu/gnubatch/Makefile'
--- a/gnu/gnubatch/Makefile     2012-11-04 16:23:10 +0000
+++ b/gnu/gnubatch/Makefile     2012-11-10 23:43:38 +0000
@@ -21,21 +21,19 @@
 
 CONFIGURE_ARGS += BATCHUSER=$(BATCHUSER) STAGED_INSTALL=true
 BUILD_ARGS += BATCHUSER=$(BATCHUSER)
-#              USERMODES="-o $(BATCHUSER) -g ${ROOTGROUP} -m 4755"
 INSTALL_ARGS += BATCHUSER=$(BATCHUSER)
-#              USERMODES="-o $(BATCHUSER) -g ${ROOTGROUP} -m 4755"
 
 pre-configure:
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/Makefile.in
-       sed -i -e 's/-o root/-o $(BATCHUSER)/g' $(WORKSRC)/Makefile.in
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/Makefile.in
        $(MAKECOOKIE)
 
 post-build:
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/Makefile
        sed -i -e 's/-g tty/-g $(TTYGROUP)/g' $(WORKSRC)/build/Makefile
-       sed -i -e 's/-o root/-o $(BATCHUSER)/g' $(WORKSRC)/build/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/build/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/loccgi/Makefile
        sed -i -e 's/-g root/-g $(ROOTGROUP)/g' $(WORKSRC)/build/remcgi/Makefile
        sed -i -e 's/-g gnubatch/-g $(BATCHUSER)/g' 
$(WORKSRC)/build/remcgi/Makefile
-       sed -i -e 's/-o root/-o $(BATCHUSER)/g' $(WORKSRC)/build/remcgi/Makefile
+       sed -i -e 's/-o root/-o $(ROOTUSER)/g' $(WORKSRC)/build/remcgi/Makefile
        $(MAKECOOKIE)

=== modified file 'gnu/gnubatch/config.mk'
--- a/gnu/gnubatch/config.mk    2012-11-04 16:23:10 +0000
+++ b/gnu/gnubatch/config.mk    2012-11-10 23:43:38 +0000
@@ -1,23 +1,21 @@
 ## Configuration options for gnubatch ##
 
-## NOTE:
-## Many design aspects of gnubatch work to make it largely incompatible
-## with GSRC, since it requires root priveleges for file permissions 
-## modifications. The GSRC build script probably breaks much or all of
-## gnubatch's functionalaity, so it may be preferable to install it the
-## old-fashioned way. Of course, if you have root priveledges, this may
-## not be a problem.
+## Note, gnuspool was designed to be installed and used in a system-wide 
manner.
+## Several files are given particular permissions. It is expected that unless 
+## you use the default settings, the software will probably not function as 
+## expected. As a result, to properly build and use this software via GSRC, you
+## will likely need root priveledges.
 
 CONFIGURE_OPTS ?= --enable-sharedlibs
 BUILD_OPTS ?=
 
-# gnubatch, by default, requires the use of a new user "gnubatch", 
-# under which it will be run. You can specify that user here. Note 
-# that, of course, that user has to exist on the system.
+# gnubatch requires that you set a batch user (default gnubatch). Only changes 
in
+# this variable are supported
 BATCHUSER = gnubatch
 
-# Many files installed by gnubatch are given 'root' or 'tty' group
-# ownership. You can specify your preferred group here. The default is
-# to use the group with the same name as the user.
-ROOTGROUP = $(BATCHUSER)
-TTYGROUP = $(BATCHUSER)
+# Many files are placed under ownership of the 'root' user/group. You may give 
them
+# a different group here. 
+ROOTUSER = root
+ROOTGROUP = root
+# Some files are assigned to the 'tty' group. You may change that here
+TTYGROUP = tty