[kernel] r11511 - in dists/trunk/redhat-cluster/openais/debian: . patches

Frederik Schüler fs at alioth.debian.org
Tue Jun 3 20:48:14 UTC 2008 

Author: fs
Date: Tue Jun  3 20:48:10 2008
New Revision: 11511

Log:
  * New upstream version.
  * Merge (partially) with Ubuntu:
    - Fix dh_* invokation order in debian/rules.
    - drop unrequired patches.
    - Fix executive startup issue if it can't open a logging file.
    - Fix liblogsys linking issues.
    - create logrotate script 
    - add postrm



Added:
   dists/trunk/redhat-cluster/openais/debian/openais.dirs
   dists/trunk/redhat-cluster/openais/debian/openais.logrotate
   dists/trunk/redhat-cluster/openais/debian/openais.postrm
   dists/trunk/redhat-cluster/openais/debian/patches/000_logsys_fix_linking.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/001_logsys_OMG_I_CANT_PRINTF.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/002_makefile.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/003_default_conf.dpatch
Removed:
   dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/002_fix_include_path.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/003_lcr-fixpath.dpatch
Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/patches/00list
   dists/trunk/redhat-cluster/openais/debian/rules

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog	Tue Jun  3 20:48:10 2008
@@ -1,3 +1,16 @@
+openais (0.83-1) unstable; urgency=low
+
+  * New upstream version.
+  * Merge (partially) with Ubuntu:
+    - Fix dh_* invokation order in debian/rules.
+    - drop unrequired patches.
+    - Fix executive startup issue if it can't open a logging file.
+    - Fix liblogsys linking issues.
+    - create logrotate script 
+    - add postrm
+
+ -- Frederik Schüler <fs at debian.org>  Tue, 03 Jun 2008 22:44:19 +0200
+
 openais (0.82-3) unstable; urgency=low
 
   * Fix FTBFS on hppa.

Added: dists/trunk/redhat-cluster/openais/debian/openais.dirs
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/openais.dirs	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,2 @@
+var/lib/openais
+var/log/openais

Added: dists/trunk/redhat-cluster/openais/debian/openais.logrotate
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/openais.logrotate	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,10 @@
+/var/log/openais/*.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+}

Added: dists/trunk/redhat-cluster/openais/debian/openais.postrm
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/openais.postrm	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+  rm -rf /var/lib/openais
+  rm -rf /var/log/openais
+fi
+
+#DEBHELPER#

Added: dists/trunk/redhat-cluster/openais/debian/patches/000_logsys_fix_linking.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/patches/000_logsys_fix_linking.dpatch	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 000_logsys_fix_linking.dpatch by  <fabbione at gordian.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openais-0.83~/exec/Makefile openais-0.83/exec/Makefile
+--- openais-0.83~/exec/Makefile	2008-05-05 16:14:25.000000000 +0200
++++ openais-0.83/exec/Makefile	2008-05-20 10:01:34.000000000 +0200
+@@ -198,7 +198,7 @@
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.2 $(TOTEM_OBJS) -o $@
+ 
+ liblogsys.so.2.0.0: $(LIBLOGSYS_OBJS)
+-	$(CC) $(LDFLAGS) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@
++	$(CC) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@ $(LDFLAGS)
+ 
+ endif
+ 

Added: dists/trunk/redhat-cluster/openais/debian/patches/001_logsys_OMG_I_CANT_PRINTF.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/patches/001_logsys_OMG_I_CANT_PRINTF.dpatch	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 001_logsys_OMG_I_CANT_PRINTF.dpatch by  <fabbione at gordian.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openais-0.83~/exec/main.c openais-0.83/exec/main.c
+--- openais-0.83~/exec/main.c	2008-05-12 15:48:06.000000000 +0200
++++ openais-0.83/exec/main.c	2008-05-20 10:02:13.000000000 +0200
+@@ -615,12 +615,7 @@
+ 
+ 	logsys_config_facility_set ("openais", main_config.syslog_facility);
+ 	logsys_config_mode_set (main_config.logmode);
+-
+-	res = logsys_config_file_set (&error_string, main_config.logfile);
+-	if (res == -1) {
+-		log_printf (LOG_LEVEL_ERROR, error_string);
+-		openais_exit_error (AIS_DONE_LOGSETUP);
+-	}
++	logsys_config_file_set (&error_string, main_config.logfile);
+ 
+ 	aisexec_uid_determine (&main_config);
+ 

Added: dists/trunk/redhat-cluster/openais/debian/patches/002_makefile.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/patches/002_makefile.dpatch	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 002_makefile.dpatch by  <fabbione at gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openais-0.82~/Makefile openais-0.82/Makefile
+--- openais-0.82~/Makefile	2007-12-13 09:06:28.000000000 +0100
++++ openais-0.82/Makefile	2007-12-13 09:07:31.000000000 +0100
+@@ -59,22 +59,7 @@
+ INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
+ MANDIR=$(PREFIX)/share/man
+ ETCDIR=/etc
+-ARCH=$(shell uname -p)
+-
+-ifeq (,$(findstring 64,$(ARCH)))
+-LIBDIR=$(PREFIX)/lib/openais
+-else
+-LIBDIR=$(PREFIX)/lib64/openais
+-endif
+-ifeq (s390,$(ARCH))
+-LIBDIR=$(PREFIX)/lib/openais
+-endif
+-ifeq (s390x,$(ARCH))
+-LIBDIR=$(PREFIX)/lib64/openais
+-endif
+-ifeq (ia64,$(ARCH))
+-LIBDIR=$(PREFIX)/lib/openais
+-endif
++LIBDIR=/usr/lib/openais
+ 
+ SUBDIRS:=$(builddir)lcr $(builddir)lib $(builddir)exec $(builddir)test
+ sub_make = srcdir=$(srcdir) builddir=$(builddir) subdir=$(1)/ $(MAKE) -I$(srcdir)$(1) -f $(srcdir)$(1)/Makefile $(2)
+@@ -180,7 +165,7 @@
+ 	    ) \
+ 	done
+ 
+-	echo $(LIBDIR) > "$(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-$(ARCH).conf"
++	echo $(LIBDIR) > "$(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais.conf"
+ 
+ 	install -m 755 $(builddir)exec/*lcrso $(DESTDIR)$(LCRSODIR)
+ 	install -m 755 $(builddir)exec/aisexec $(DESTDIR)$(SBINDIR)
+diff -urNad openais-0.82~/Makefile.inc openais-0.82/Makefile.inc
+--- openais-0.82~/Makefile.inc	2007-12-13 09:06:28.000000000 +0100
++++ openais-0.82/Makefile.inc	2007-12-13 09:06:28.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Common options
+ PREFIX=/usr
+ DESTDIR=
+-LCRSODIR=$(PREFIX)/libexec/lcrso
++LCRSODIR=/usr/lib/openais/lcrso
+ 
+ # Do not modify below this line
+ 

Added: dists/trunk/redhat-cluster/openais/debian/patches/003_default_conf.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/patches/003_default_conf.dpatch	Tue Jun  3 20:48:10 2008
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 003_default_conf.dpatch by  <fabbione at gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openais-0.82~/conf/openais.conf openais-0.82/conf/openais.conf
+--- openais-0.82~/conf/openais.conf	2007-10-30 06:17:26.000000000 +0100
++++ openais-0.82/conf/openais.conf	2007-10-30 06:18:12.000000000 +0100
+@@ -4,6 +4,8 @@
+ 	version: 2
+ 	secauth: off
+ 	threads: 0
++	rrp_mode: none
++	vsftype: none
+ 	interface {
+ 		ringnumber: 0
+ 		bindnetaddr: 192.168.2.0
+@@ -14,9 +16,9 @@
+ 
+ logging {
+ 	fileline: off
+-	to_stderr: yes
++	to_stderr: no
+ 	to_file: yes
+-	logfile: /tmp/openais.log
++	logfile: /var/log/openais/openais.log
+ 	debug: off
+ 	timestamp: on
+ 	logger_subsys {

Modified: dists/trunk/redhat-cluster/openais/debian/patches/00list
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/patches/00list	(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/00list	Tue Jun  3 20:48:10 2008
@@ -1,3 +1,4 @@
-001_makefile
-003_lcr-fixpath
-005_add_hppa_workaround.dpatch
+000_logsys_fix_linking.dpatch
+001_logsys_OMG_I_CANT_PRINTF.dpatch
+002_makefile.dpatch
+003_default_conf.dpatch

Modified: dists/trunk/redhat-cluster/openais/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/rules	(original)
+++ dists/trunk/redhat-cluster/openais/debian/rules	Tue Jun  3 20:48:10 2008
@@ -52,8 +52,10 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp/
-	dh_install --sourcedir=debian/tmp
+	
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/debian/tmp/ STATICLIBS=YES
+	install -m 755 $(DIR)/test/openais-cfgtool $(CURDIR)/debian/tmp/usr/sbin
+	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs CHANGELOG
 	dh_installdirs
 	dh_installdocs
@@ -64,8 +66,8 @@
 endif
 	dh_compress
 	dh_fixperms
-	dh_installdeb
 	dh_makeshlibs -V
+	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums

More information about the Kernel-svn-changes mailing list