[med-svn] r7394 - in trunk/packages/fis-gtm: . fis-gtm-initial-i386/trunk/debian fis-gtm-server/trunk/debian fis-gtm-server/trunk/debian/patches

Mon Aug 8 20:02:07 UTC 2011

Author: alteholz-guest
Date: 2011-08-08 20:02:06 +0000 (Mon, 08 Aug 2011)
New Revision: 7394

Added:
   trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/
   trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/include-path.patch
   trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/series
Modified:
   trunk/packages/fis-gtm/README
   trunk/packages/fis-gtm/TODO
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst
   trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/defaults.template.template
   trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/postinst
Log:
added alternatives, changed default user to root

Modified: trunk/packages/fis-gtm/README
===================================================================

--- trunk/packages/fis-gtm/README	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/README	2011-08-08 20:02:06 UTC (rev 7394)
@@ -1,16 +1,31 @@
 fis-gtm consists of several packages
   - fis-gtm 
-	This is a meta package that all other package shall depend on.
+	This is a meta package that all other packages shall depend on.
 	Depending on the architecture the correct binary package will
 	be selected.
 
-  - fis-gtm-initial-amd64
-  - fis-gtm-initial-i386
-	These are architecture depending binary packages as they are 
-	provided by upstream. They are needed to build fis-gtm from
-	source. We will start with these two first. Maybe later we
-	can build our own binary packages and do not need these anymore.
+  - fis-gtm-initial
+	This is a binary package as provided by upstream. It includes 
+        software to build fis-gtm from source on i386 and amd64. 
+        We will start with this first. Maybe later we can build our own 
+        binary 'bootstrap'-packages and do not need these anymore.
 
   - fis-gtm-server
 	This package is built from the source package provided by upstream. 
 
+
+Userid/Groupid:
+  Although the configure script asks for a userid/groupid, there is no
+  real need for one. In Debian, the default is set to root/root
+  This might change when using GT.CM, so we will still keep userid/groupid
+  variable.
+
+package management
+  New releases will be installed as fis-gtm-server. In case any of these
+  releases is needed by other packages, an upload with version needs to
+  be done:
+   fis-gtm-server -> fis-gtm-server-54002A, and fis-gtm -> fis-gtm-54002A
+  So any DM can upload the newest version and a DD is only needed for
+  packages with explicit versions.
+  In case the version of fis-gtm is important for any package, it should
+  depend on fis-gtm-54002A|fis-gtm

Modified: trunk/packages/fis-gtm/TODO
===================================================================
--- trunk/packages/fis-gtm/TODO	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/TODO	2011-08-08 20:02:06 UTC (rev 7394)
@@ -1,3 +1,3 @@
-20110720, ta, copy i386 package to amd64 
 20110720, ta, piuparts check 
 20110720, ta, create test scenario (create DB, put in some data and query)
+20110726, ta, script for gtm

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates	2011-08-08 20:02:06 UTC (rev 7394)
@@ -1,6 +1,6 @@
 Template: fisgtm/username
 Type: string
-Default: fisgtm
+Default: root
 _Description: Dedicated system account for the FIS-GTM daemon:
  The FIS-GTM server must use a dedicated account for its operation so that
  the system's security is not compromised by running it with superuser
@@ -8,7 +8,7 @@
 
 Template: fisgtm/groupname
 Type: string
-Default: fisgtm
+Default: root
 _Description: Dedicated system group for the FIS-GTM daemon:
  The FIS-GTM server must use a dedicated group for its operation so that
  the system's security is not compromised by running it with superuser

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst	2011-08-08 20:02:06 UTC (rev 7394)
@@ -26,8 +26,8 @@
     configure)
 	# generate $CONFFILE from debconf settings and $TEMPLATE
 	db_version 2.0
-	db_get fisgtm/username && FISGTM_USER="$RET" || FISGTM_USER="fisgtm"
-	db_get fisgtm/groupname && FISGTM_GROUP="$RET" || FISGTM_GROUP="fisgtm"
+	db_get fisgtm/username && FISGTM_USER="$RET" || FISGTM_USER="root"
+	db_get fisgtm/groupname && FISGTM_GROUP="$RET" || FISGTM_GROUP="root"
 
 	tmpfile=`mktemp /tmp/fisgtm.XXXXXXXXXX`
 	chmod 644 $tmpfile
@@ -61,17 +61,22 @@
 	echo " "
 	echo "##############################################"
 	echo "automatic configuration, please be patient ..."
-	# user <uid>
-	# group <gid>
-	# limit access to users in group <y/n>
+        # userid that owns binaries (root)
+        # groupid that owns binaries (root)
+        # restrict access to groupid (should be "n")
+        # directory for installation (...)
+        # create directory (y)
+        # use unicode (y) (bug in configure)
+        # use upper- and lowercase (n)
+        # remove old files (y)
 	./configure <<EOT
 $FISGTM_USER
 $FISGTM_GROUP
 n
 $FISGTM_ROOT/$FISGTM_VERSION_INITIAL-initial
 y
+y
 n
-n
 y
 EOT
 	echo " "

Modified: trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/defaults.template.template
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/defaults.template.template	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/defaults.template.template	2011-08-08 20:02:06 UTC (rev 7394)
@@ -1,10 +1,10 @@
 # Run FIS GTM as this user ID. Not setting this or leaving it blank will use the
-# default of fisgtm.
-FISGTM_USER=fisgtm
+# default of root.
+FISGTM_USER=root
 
 # Run FIS GTM as this group ID. Not setting this or leaving it blank will use
-# the default of fisgtm.
-FISGTM_GROUP=fisgtm
+# the default of root.
+FISGTM_GROUP=root
 
 # root directory of FIS GTM. Not setting this or leaving it blank will use
 # the default of /usr/lib/fis-gtm.

Added: trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/include-path.patch
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/include-path.patch	                        (rev 0)
+++ trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/include-path.patch	2011-08-08 20:02:06 UTC (rev 7394)
@@ -0,0 +1,26 @@
+--- fis-gtm-server.org/sr_linux/gtm_env_sp.mk	2011-08-02 18:16:25.000000000 +0200
++++ fis-gtm-server/sr_linux/gtm_env_sp.mk	2011-08-02 18:47:37.000000000 +0200
+@@ -65,8 +65,11 @@
+ gt_cc_option_optimize=-O2 -fno-defer-pop -fno-strict-aliasing -ffloat-store
+ gt_cc_options_common+= -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -fsigned-char
+ 
++# add this to compile for Debian
++gt_cc_option_I= -I/usr/include/asm
++
+ ifeq ($(gt_build_type),32)
+-gt_cc_option_I=-I-
++gt_cc_option_I+=-I-
+ endif
+ 
+ ifeq ($(gt_machine_type), x86_64)
+@@ -85,8 +88,8 @@
+ # with always includeing it.
+ 
+ gt_cc_option_I+= -I/emul/ia32-linux/usr/include/
+-else
+-gt_cc_option_I=
++#else
++#gt_cc_option_I=
+ endif
+ endif
+ 

Added: trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/series
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/patches/series	2011-08-08 20:02:06 UTC (rev 7394)
@@ -0,0 +1 @@
+include-path.patch

Modified: trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/postinst
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/postinst	2011-08-08 17:18:50 UTC (rev 7393)
+++ trunk/packages/fis-gtm/fis-gtm-server/trunk/debian/postinst	2011-08-08 20:02:06 UTC (rev 7394)
@@ -54,21 +54,29 @@
 	echo " "
 	echo "##############################################"
 	echo "automatic configuration, please be patient ..."
+	# userid that owns binaries (root)
+        # groupid that owns binaries (root)
+        # restrict access to groupid (should be "n")
+        # directory for installation (...)
+        # create directory (y)
+        # use unicode (y) (bug in configure)
+        # use upper- and lowercase (n)
+        # remove old files (y)
 	./configure <<EOT
 $FISGTM_USER
 $FISGTM_GROUP
-y
+n
 $FISGTM_ROOT/$FISGTM_VERSION
 y
+y
 n
-n
 y
 EOT
 	echo " "
 	echo "... automatic configuration finished"
 	echo "##############################################"
 	cd ..
-	rmdir TMPPOSTINST
+	rm -rf TMPPOSTINST
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -80,6 +88,23 @@
     ;;
 esac
 
+# configure alternatives
+cd $FISGTM_ROOT
+#do not clean but just override: update-alternatives --remove-all fisgtm
+# the latest version should have the highest number and appear at the
+# end of this list
+prio=10
+for dir in `ls -1|grep -v initial|grep -v current`; do
+  if  [ -d $dir ]; then
+    echo "I: test $dir"
+    if [ -f $dir/gtm ]; then
+      echo "I: add $dir with prio $prio"
+      update-alternatives --install /usr/lib/fis-gtm/current fisgtm /usr/lib/fis-gtm/$dir $prio
+      prio=$((prio+10))
+    fi
+  fi
+done
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 


