Attachment 8030 Details for Bug 9276 – Patches for v4-0-test

[patch] Patches for v4-0-test

tmp40.diff (text/plain), 6.68 KB, created by Stefan Metzmacher on 2012-10-10 06:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2012-10-10 06:29:36 UTC

Size: 6.68 KB

patch

obsolete

>From e1172f588716a49f21c22bff98d41d42fd72fd30 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Fri, 14 Sep 2012 00:25:38 +0200
>Subject: [PATCH 1/3] packaging: apply some solaris packaging fixes
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Actually this might be outdated already. See bug #5670.
>Thanks to Michal Ludvig.
>
>Autobuild-User(master): BjÃ¶rn Jacke <bj@sernet.de>
>Autobuild-Date(master): Fri Sep 14 02:42:53 CEST 2012 on sn-devel-104
>---
> packaging/Solaris/README     |   10 ++++------
> packaging/Solaris/makepkg.sh |   24 +++++++++++++-----------
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/packaging/Solaris/README b/packaging/Solaris/README
>index b8d0b2c..3e8435e 100644
>--- a/packaging/Solaris/README
>+++ b/packaging/Solaris/README
>@@ -1,15 +1,13 @@
> 
> INSTRUCTIONS: Preparing Samba packages for Solaris
> 
>+Make sure that your $PATH contains directories /usr/sfw/bin and /usr/ccs/bin
>+
> To produce a package:
> 
>-* Type sh makepkg.sh
>+* Type sh makepkg.sh build
> 
> The package will be created in the /tmp directory.
> 
>-By default, the package will be built to install samba in /usr/local
>+By default, the package will be built to install samba in /opt/samba
> To change the default, modify the INSTALL_BASE variable in makepkg.sh
>-This is after you have configured samba with a --prefix option of the 
>-alternate samba location and then created the binaries.
>-
>-
>diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh
>index f038d32..b40320d 100644
>--- a/packaging/Solaris/makepkg.sh
>+++ b/packaging/Solaris/makepkg.sh
>@@ -1,4 +1,4 @@
>-#!/bin/sh
>+#!/bin/sh -e
> #
> # Copyright (C) Shirish A Kalele 2000
> # Copyright (C) Gerald Carter    2004
>@@ -50,13 +50,9 @@ add_dynamic_entries()
> 	
> 	echo "#\n# libsmbclient\n#"
> 	echo f none lib/libsmbclient.so 0755 root other
>-	echo f none lib/libsmbclient.a 0755 root other
> 	echo f none include/libsmbclient.h 0644 root other
> 
> 	echo "#\n# libmsrpc\n#"
>-	echo f none lib/libmsrpc.so 0755 root other
>-	echo f none lib/libmsrpc.a 0755 root other
>-	echo f none include/libmsrpc.h 0644 root other
> 
> 	if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then
> 		echo "#\n# smbwrapper\n#"
>@@ -76,17 +72,19 @@ add_dynamic_entries()
> 	echo "#\n# man pages \n#"
> 
> 	# Create directories for man page sections if nonexistent
>-	cd man
>+	cd share/man
> 	for i in 1 2 3 4 5 6 7 8 9; do
>+		set +e
> 		manpages=`ls man$i 2>/dev/null`
>+		set -e
> 		if [ $? -eq 0 ]; then
>-			echo d none man/man${i} ? ? ?
>+			echo d none share/man/man${i} ? ? ?
> 			for manpage in $manpages; do
>-				echo f none man/man${i}/${manpage} 0644 root other
>+				echo f none share/man/man${i}/${manpage} 0644 root other
> 			done
> 		fi
> 	done
>-	cd ..
>+	cd ../..
> 
> 	echo "#\n# SWAT \n#"
> 	list=`find swat -type d | grep -v "/.svn$"`
>@@ -128,7 +126,7 @@ echo "Install directory:  $INSTALL_BASE"
> 
> cd $DISTR_BASE/source
> 
>-if test "x$1" = "xbuild" ]; then
>+if test "x$1" = "xbuild" -o ! -f bin/smbd ]; then
> 	./configure --prefix=$INSTALL_BASE \
> 		--localstatedir=/var/lib/samba \
> 		--with-piddir=/var/run \
>@@ -136,6 +134,7 @@ if test "x$1" = "xbuild" ]; then
> 		--with-privatedir=/etc/samba/private \
> 		--with-configdir=/etc/samba \
> 		--with-lockdir=/var/lib/samba \
>+		--with-mandir=/usr/share/man \
> 		--with-pam --with-acl-support \
> 		--with-quotas --with-included-popt \
> 	&& make
>@@ -146,7 +145,8 @@ if test "x$1" = "xbuild" ]; then
> 	fi
> fi
> 	
>-mkdir $TMPINSTALLDIR
>+rm -rf $TMPINSTALLDIR
>+mkdir -p $TMPINSTALLDIR
> make DESTDIR=$TMPINSTALLDIR install
> 
> ## clear out *.old
>@@ -155,6 +155,8 @@ find $TMPINSTALLDIR -name \*.old |while read x; do rm -rf "$x"; done
> ##
> ## Now get the install locations
> ##
>+LD_LIBRARY_PATH=$DISTR_BASE/source/bin
>+export LD_LIBRARY_PATH
> SBINDIR=`bin/smbd -b | grep SBINDIR | awk '{print $2}'`
> BINDIR=`bin/smbd -b | grep BINDIR | grep -v SBINDIR |  awk '{print $2}'`
> SWATDIR=`bin/smbd -b | grep SWATDIR | awk '{print $2}'`
>-- 
>1.7.9.5
>
>
>From 833bf1f78da9eada23039adf6e0d2e9cf2ed8309 Mon Sep 17 00:00:00 2001
>From: Karolin Seeger <kseeger@samba.org>
>Date: Tue, 18 Sep 2012 11:08:17 +0200
>Subject: [PATCH 2/3] RHEL packaging: Try to fix makerpms.sh on RHEL.
>
>Address bug #9165 - makerpms.sh can't create package fo RHEL.
>
>Karolin
>
>Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
>Autobuild-Date(master): Tue Sep 18 12:51:01 CEST 2012 on sn-devel-104
>---
> packaging/RHEL/samba.spec.tmpl |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
>index 152bad7..adbc6df 100644
>--- a/packaging/RHEL/samba.spec.tmpl
>+++ b/packaging/RHEL/samba.spec.tmpl
>@@ -2,7 +2,7 @@
> %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
> %define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
> %if %{this_is_redhat} > 0
>-%define rhel_ver %(lsb_release -sr)
>+%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\$[0-9]*\$.*/\\1/g")
> %else
> %define rhel_ver 0
> %endif
>-- 
>1.7.9.5
>
>
>From ef7d383334a4f24f2704084e45de409be21640bf Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@cryptomilk.org>
>Date: Tue, 9 Oct 2012 14:25:29 +0200
>Subject: [PATCH 3/3] packaging: Add config for systemd-tmpfiles.
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Tue Oct  9 17:10:53 CEST 2012 on sn-devel-104
>(cherry picked from commit 66018ea4fbe290cad6aef54454c1f0703f0dff40)
>---
> packaging/systemd/README         |   14 ++++++++++++++
> packaging/systemd/samba.conf.tmp |    1 +
> 2 files changed, 15 insertions(+)
> create mode 100644 packaging/systemd/README
> create mode 100644 packaging/systemd/samba.conf.tmp
>
>diff --git a/packaging/systemd/README b/packaging/systemd/README
>new file mode 100644
>index 0000000..c185b2c
>--- /dev/null
>+++ b/packaging/systemd/README
>@@ -0,0 +1,14 @@
>+With systemd the /run or /var/run are tmpfs filesystems. This means
>+the direcories required by samba need to be created during startup.
>+This can be done with a config file for tmpfiles, see samba.conf.tmp.
>+You need to copy this file to the directoy systemd-tmpfiles is looking
>+for its config files e.g.:
>+
>+install -d -m 0755 /etc/tmpfiles.d/
>+install -m644 samba.conf.tmp /etc/tmpfiles.d/samba.conf
>+
>+If you're a packager don't forget to run the systemd-tmpfiles binary
>+in the script after samba has been installed. This makes sure the
>+directory exists and you can start samba directly after the installation.
>+
>+/usr/bin/systemd-tmpfiles --create /etc/tmpfiles.d/samba.conf
>diff --git a/packaging/systemd/samba.conf.tmp b/packaging/systemd/samba.conf.tmp
>new file mode 100644
>index 0000000..8a29577
>--- /dev/null
>+++ b/packaging/systemd/samba.conf.tmp
>@@ -0,0 +1 @@
>+d /var/run/samba  755 root root
>-- 
>1.7.9.5
>

Flags:

kseeger: review+

Actions: View

Attachments on bug 9276: 8030