[med-svn] r17948 - in trunk/packages/arb/trunk/debian: . patches
Elmar Pruesse
epruesse-guest at moszumanska.debian.org
Sun Sep 7 16:19:21 UTC 2014
Author: epruesse-guest
Date: 2014-09-07 16:19:20 +0000 (Sun, 07 Sep 2014)
New Revision: 17948
Added:
trunk/packages/arb/trunk/debian/patches/50_private_nameservers
Modified:
trunk/packages/arb/trunk/debian/arb-common.postinst
trunk/packages/arb/trunk/debian/arb-common.templates
trunk/packages/arb/trunk/debian/patches/10_upstream_r12793__show_db_load_progress
trunk/packages/arb/trunk/debian/patches/20_upstream_r12794__socket_permissions
trunk/packages/arb/trunk/debian/patches/30_upstream_r12814__desktop_keywords
trunk/packages/arb/trunk/debian/patches/40_upstream_r12815__lintian_spelling
trunk/packages/arb/trunk/debian/patches/series
Log:
- add upstream keyword and URL to patches cherry picked from upstream
- add patch to move nameservers into user HOMEs (avoid user writable dir)
- templates: change arb/group description -- only for shared pt servers now
- postinst: set setgid on /var/lib/arb/pts directory
Modified: trunk/packages/arb/trunk/debian/arb-common.postinst
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.postinst 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/arb-common.postinst 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,14 +1,12 @@
#!/bin/sh
set -e
-PROG=arb
-GROUP=${PROG}
+GROUP=arb
-DEBCONF_DEBUG=developer
. /usr/share/debconf/confmodule
db_version 2.0
-db_get ${PROG}/group
+db_get arb/group
retusers=${RET}
db_go || true
@@ -22,7 +20,7 @@
fi
done
-# Del those users which were obviousely removed from list of ${PROG} users
+# Del those users which were obviousely removed from list of arb users
for user in ${CURRENTGROUPUSERS} ; do
if ! `echo "$retusers" | grep -q -w "$user"` && \
`getent group "$GROUP" | grep -q -w $user` ; then
@@ -30,24 +28,14 @@
fi
done
-ptsdir=/var/lib/${PROG}/pts
+ptsdir=/var/lib/arb/pts
-# Make sure that demo pts-server file can be accesed by members of group arb
-[ -d ${ptsdir} ] || mkdir -p ${ptsdir}
-ptsdemo=${ptsdir}/demo.arb
-# Create empty pts-server demo file
-touch $ptsdemo
-chgrp ${GROUP} $ptsdemo
-chmod 664 $ptsdemo
-
-# Make sure that users in group arb are able to write to pts-server dir
+# Make sure PT server directory is
+# - owned by group arb
chgrp ${GROUP} $ptsdir
-chmod 775 $ptsdir
+# - readable and enterable by everyone
+# - writeable by arb group members
+# - files created in directory inherit group (setgid)
+chmod 2775 $ptsdir
-nasdir=/var/lib/${PROG}/nas
-# Make sure that nameserver can be accesed by members of group arb
-[ -d ${nasdir} ] || mkdir -p ${nasdir}
-chgrp ${GROUP} $nasdir
-chmod 775 $nasdir
-
#DEBHELPER#
Modified: trunk/packages/arb/trunk/debian/arb-common.templates
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.templates 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/arb-common.templates 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,6 +1,10 @@
Template: arb/group
Type: multiselect
Choices: ${users}
-_Description: Arb users:
- Please choose, among the list of all unprivileged users of the system,
- those who will be allowed running ${pkg}.
+_Description: ARB PT-server admins
+ ARB is preconfigured via /etc/arb/arb_tcp.dat with three private PT-servers
+ for each user and three global PT servers accessible by all users.
+ .
+ Which users should be allowed to build and update the shared PT-servers?
+ .
+ (Select none if you do not know what this means, yet.)
Modified: trunk/packages/arb/trunk/debian/patches/10_upstream_r12793__show_db_load_progress
===================================================================
--- trunk/packages/arb/trunk/debian/patches/10_upstream_r12793__show_db_load_progress 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/patches/10_upstream_r12793__show_db_load_progress 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,7 +1,8 @@
Author: Elmar Pruesse <elmar at pruesse.net>
Last-Update: Tue, 02 Sep 2014 15:15:06 +0200
-Description: backported patch showing progress while ARB is loading a database
+Description:show progress while ARB is loading a database
(needed as indicator/splash screen while ARB is launching)
+Origin: upstream, http://bugs.arb-home.de/log/trunk?revs=12792-12793,12795
--- a/ARBDB/ad_load.cxx
+++ b/ARBDB/ad_load.cxx
Modified: trunk/packages/arb/trunk/debian/patches/20_upstream_r12794__socket_permissions
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_upstream_r12794__socket_permissions 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/patches/20_upstream_r12794__socket_permissions 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,6 +1,7 @@
Author: Elmar Pruesse <elmar at pruesse.net>
Last-Update: Tue, 02 Sep 2014 15:15:06 +0200
Description: backported security fix
+Origin: upstream, http://bugs.arb-home.de/changeset/12794
--- a/SH/arb_launcher
+++ b/SH/arb_launcher
Modified: trunk/packages/arb/trunk/debian/patches/30_upstream_r12814__desktop_keywords
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_upstream_r12814__desktop_keywords 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/patches/30_upstream_r12814__desktop_keywords 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,7 +1,7 @@
Author: Elmar Pruesse <elmar at pruesse.net>
Last-Update: Tue, 02 Sep 2014 17:54:23 +0200
-Description: backported patch adding keywords to arb.desktop
- (fixes lintian warning)
+Description: add keywords to arb.desktop
+Origin: upstream, http://bugs.arb-home.de/changeset/12814
--- a/lib/desktop/arb.desktop
+++ b/lib/desktop/arb.desktop
Modified: trunk/packages/arb/trunk/debian/patches/40_upstream_r12815__lintian_spelling
===================================================================
--- trunk/packages/arb/trunk/debian/patches/40_upstream_r12815__lintian_spelling 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/patches/40_upstream_r12815__lintian_spelling 2014-09-07 16:19:20 UTC (rev 17948)
@@ -1,6 +1,7 @@
Author: Elmar Pruesse <elmar at pruesse.net>
Last-Update: Tue, 02 Sep 2014 17:56:47 +0200
-Description: backported patch fixing lintian detected spelling errors
+Description: fix lintian detected spelling errors
+Origin: upstream, http://bugs.arb-home.de/changeset/12815
--- a/GDE/CLUSTALW/interface.c
+++ b/GDE/CLUSTALW/interface.c
Added: trunk/packages/arb/trunk/debian/patches/50_private_nameservers
===================================================================
--- trunk/packages/arb/trunk/debian/patches/50_private_nameservers (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/50_private_nameservers 2014-09-07 16:19:20 UTC (rev 17948)
@@ -0,0 +1,33 @@
+Description: change nameservers to be per-user
+ By default, ARB shares one "name server" database across an installation.
+ This is historical and no longer a useful default for "unadministered"
+ use of ARB. The patch changes the config to create separate name databases
+ for each user, avoiding the necessity for a directory writeable by all
+ ARB users.
+Author: Elmar Pruesse <elmar at oruesse.net>
+Origin: other
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/arb_tcp_org.dat
++++ b/lib/arb_tcp_org.dat
+@@ -56,8 +56,8 @@
+ # You may define additional nameservers, using one additional field for identification.
+ # The defined nameserver 'ARB_NAME_SERVER_START' uses the fields 'acc' and 'start'.
+
+-ARB_NAME_SERVER localhost:3020 arb_name_server -d$(ARBHOME)/lib/nas/names.dat
+-ARB_NAME_SERVER_START localhost:3021 arb_name_server -d$(ARBHOME)/lib/nas/names_start.dat -fstart=1
++ARB_NAME_SERVER :$(HOME)/.arb_pts/names.socket arb_name_server -d$(HOME)/.arb_pts/names.dat
++ARB_NAME_SERVER_START :$(HOME)/.arb_pts/names_start.socket arb_name_server -d$(HOME)/.arb_pts/names_start.dat -fstart=1
+ # ARB_NAME_SERVER_STRAIN localhost:3022 arb_name_server -d$(ARBHOME)/lib/nas/names_strain.dat -fstrain=
+ # ARB_NAME_SERVER_POS_START localhost:3023 arb_name_server -d$(ARBHOME)/lib/nas/names_pos_start.dat -fpos_start=1
+
+@@ -73,8 +73,4 @@
+ ARB_PT_SERVER3 :$(HOME)/.arb_pts/$(USER)1.socket arb_pt_server -D$(HOME)/.arb_pts/$(USER)1.arb
+ ARB_PT_SERVER4 :$(HOME)/.arb_pts/$(USER)2.socket arb_pt_server -D$(HOME)/.arb_pts/$(USER)2.arb
+ ARB_PT_SERVER5 :$(HOME)/.arb_pts/$(USER)3.socket arb_pt_server -D$(HOME)/.arb_pts/$(USER)3.arb
+-ARB_PT_SERVER6 localhost:3033 arb_pt_server -D$(ARBHOME)/lib/pts/user1.arb
+-ARB_PT_SERVER7 localhost:3034 arb_pt_server -D$(ARBHOME)/lib/pts/user2.arb
+-ARB_PT_SERVER8 localhost:3035 arb_pt_server -D$(ARBHOME)/lib/pts/user3.arb
+-ARB_PT_SERVER9 localhost:3036 arb_pt_server -D$(ARBHOME)/lib/pts/user4.arb
+-ARB_PT_SERVER10 localhost:3037 arb_pt_server -D$(ARBHOME)/lib/pts/user5.arb
++
Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series 2014-09-05 13:29:37 UTC (rev 17947)
+++ trunk/packages/arb/trunk/debian/patches/series 2014-09-07 16:19:20 UTC (rev 17948)
@@ -2,3 +2,4 @@
20_upstream_r12794__socket_permissions
30_upstream_r12814__desktop_keywords
40_upstream_r12815__lintian_spelling
+50_private_nameservers
More information about the debian-med-commit
mailing list