[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. debian/2%4.0.6+dfsg-1-7-g4671672
Ivo De Decker
ivo.dedecker at ugent.be
Tue Jul 2 19:29:45 UTC 2013
The following commit has been merged in the samba_4.0 branch:
commit 8420d90774093952bfba9ea5cc7462dfa3faaa74
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Tue Jul 2 20:20:56 2013 +0200
refresh patches for new upstream version 4.0.7
remove patches integrated upstream
diff --git a/debian/changelog b/debian/changelog
index 8984853..3a56b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ samba (2:4.0.7+dfsg-1) UNRELEASED; urgency=low
[ Ivo De Decker ]
* New upstream release
+ * refresh patches for new upstream version
+ * remove patches integrated upstream
-- Ivo De Decker <ivo.dedecker at ugent.be> Tue, 02 Jul 2013 20:04:08 +0200
diff --git a/debian/patches/0001-build-Add-missing-new-line-to-replaced-python-sheban.patch b/debian/patches/0001-build-Add-missing-new-line-to-replaced-python-sheban.patch
deleted file mode 100644
index ce409ab..0000000
--- a/debian/patches/0001-build-Add-missing-new-line-to-replaced-python-sheban.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0996e95c00ffc468e6482877f21bae3a0f01abe9 Mon Sep 17 00:00:00 2001
-From: Michael Adam <obnox at samba.org>
-Date: Tue, 28 May 2013 12:19:34 +0200
-Subject: [PATCH] build: Add missing new line to replaced python shebang line.
- (Fix bug #9909)
-
-When configuring with a non-standard python specified in
-the PYTHON environment variable, the shebang lines in various
-python tools like samba-tool and samba_dnsupdate get replaced.
-
-This replace line for the shebang was missing a newline
-which joined the shebang line with the following line,
-rendereing those scripts with a nonempty second line unusuable,
-for example samba_dnsupdate.
-
-This patch fixes this bug which is bug #9909 on bugzilla.
-
-Pair-Programmed-With: Karolin Seeger <kseeger at samba.org>
-
-Signed-off-by: Michael Adam <obnox at samba.org>
-Signed-off-by: Karolin Seeger <kseeger at samba.org>
-
-Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-
-Autobuild-User(master): Michael Adam <obnox at samba.org>
-Autobuild-Date(master): Wed May 29 13:21:51 CEST 2013 on sn-devel-104
-(cherry picked from commit 3f24d694e7e2190d30a17bc13a79a36b49711531)
----
- buildtools/wafsamba/wafsamba.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
-index 3559cc1..8eace08 100644
---- a/buildtools/wafsamba/wafsamba.py
-+++ b/buildtools/wafsamba/wafsamba.py
-@@ -699,9 +699,9 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
- shebang = None
-
- if task.env["PYTHON"][0] == "/":
-- replacement_shebang = "#!%s" % task.env["PYTHON"]
-+ replacement_shebang = "#!%s\n" % task.env["PYTHON"]
- else:
-- replacement_shebang = "#!/usr/bin/env %s" % task.env["PYTHON"]
-+ replacement_shebang = "#!/usr/bin/env %s\n" % task.env["PYTHON"]
-
- installed_location=task.outputs[0].bldpath(task.env)
- source_file = open(task.inputs[0].srcpath(task.env))
---
-1.7.11.7
-
diff --git a/debian/patches/0001-build-Install-smbtar-in-waf-build.patch b/debian/patches/0001-build-Install-smbtar-in-waf-build.patch
deleted file mode 100644
index f2c71fa..0000000
--- a/debian/patches/0001-build-Install-smbtar-in-waf-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 80029c04da81590b658eb5769426dd0a3faa5891 Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet at samba.org>
-Date: Sun, 26 May 2013 21:05:12 +1000
-Subject: [PATCH] build: Install smbtar in waf build
-
----
- source3/script/wscript_build | 7 +++++++
- source3/wscript_build | 1 +
- 2 files changed, 8 insertions(+)
- create mode 100644 source3/script/wscript_build
-
-diff --git a/source3/script/wscript_build b/source3/script/wscript_build
-new file mode 100644
-index 0000000..fc59a65
---- /dev/null
-+++ b/source3/script/wscript_build
-@@ -0,0 +1,7 @@
-+#!/usr/bin/env python
-+
-+from samba_utils import MODE_755
-+
-+bld.INSTALL_FILES('${BINDIR}',
-+ 'smbtar',
-+ chmod=MODE_755, flat=True)
-diff --git a/source3/wscript_build b/source3/wscript_build
-index 0a85653..83ac32a 100755
---- a/source3/wscript_build
-+++ b/source3/wscript_build
-@@ -1637,6 +1637,7 @@ bld.RECURSE('modules')
- bld.RECURSE('pam_smbpass')
- bld.RECURSE('passdb')
- bld.RECURSE('rpc_server')
-+bld.RECURSE('script')
- bld.RECURSE('winbindd')
- bld.RECURSE('../examples/auth')
- bld.RECURSE('../examples/libsmbclient')
---
-1.7.11.7
-
diff --git a/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch b/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch
deleted file mode 100644
index dab35a9..0000000
--- a/debian/patches/0001-heimdal-Remove-samba4kgetcred-again.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 22b005a59ff3db88783cd1f329c97b823ea3f03f Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet at samba.org>
-Date: Sun, 16 Jun 2013 13:32:10 +1000
-Subject: [PATCH] heimdal: Remove samba4kgetcred again
-
-This tool is not used in our tests, is not installed, and causes the build
-to fail on current debian unstable due to a new binutils (when linked
-with the system Heimdal).
-
-Andrew Bartlett
----
- source4/heimdal_build/wscript_build | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
-index 44634b4..365d319 100644
---- a/source4/heimdal_build/wscript_build
-+++ b/source4/heimdal_build/wscript_build
-@@ -946,12 +946,6 @@ HEIMDAL_BINARY('samba4kinit',
- install=False
- )
-
--HEIMDAL_BINARY('samba4kgetcred',
-- 'kuser/kgetcred.c',
-- deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
-- install=False
-- )
--
- HEIMDAL_BINARY('samba4kpasswd',
- 'kpasswd/kpasswd.c',
- deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
---
-1.7.11.7
-
diff --git a/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch b/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
index 2063e91..c482fb5 100644
--- a/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
+++ b/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
@@ -15,11 +15,9 @@ Andrew Bartlett
lib/replace/wscript | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
-diff --git a/lib/replace/wscript b/lib/replace/wscript
-index 9dfa985..af527bc 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
-@@ -22,6 +22,10 @@ def set_options(opt):
+@@ -22,6 +22,10 @@
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba')
@@ -30,7 +28,7 @@ index 9dfa985..af527bc 100644
@wafsamba.runonce
def configure(conf):
-@@ -482,16 +486,17 @@ removeea setea
+@@ -512,16 +516,17 @@
execute=True):
break
@@ -57,6 +55,3 @@ index 9dfa985..af527bc 100644
conf.RECURSE('system')
conf.SAMBA_CONFIG_H()
---
-1.7.11.7
-
diff --git a/debian/patches/01_no_private_lib_suffix.diff b/debian/patches/01_no_private_lib_suffix.diff
index 7787de2..a597586 100644
--- a/debian/patches/01_no_private_lib_suffix.diff
+++ b/debian/patches/01_no_private_lib_suffix.diff
@@ -1,7 +1,7 @@
=== modified file 'buildtools/wafsamba/wafsamba.py'
---- a/buildtools/wafsamba/wafsamba.py 2010-12-15 10:48:15 +0000
-+++ b/buildtools/wafsamba/wafsamba.py 2010-12-17 16:35:35 +0000
-@@ -205,8 +205,7 @@
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -210,8 +210,7 @@
if target_type == 'PYTHON' or realname or not private_library:
bundled_name = libname.replace('_', '-')
else:
diff --git a/debian/patches/05_share_ldb_module b/debian/patches/05_share_ldb_module
index e585ffe..afad92f 100644
--- a/debian/patches/05_share_ldb_module
+++ b/debian/patches/05_share_ldb_module
@@ -1,7 +1,7 @@
=== modified file 'source4/param/wscript_build'
---- old/source4/param/wscript_build 2011-07-08 10:35:56 +0000
-+++ new/source4/param/wscript_build 2011-07-26 00:34:41 +0000
-@@ -40,7 +40,7 @@
+--- a/source4/param/wscript_build
++++ b/source4/param/wscript_build
+@@ -18,7 +18,7 @@
source='share_classic.c',
subsystem='share',
init_function='share_classic_init',
@@ -10,7 +10,7 @@
)
-@@ -48,7 +48,8 @@
+@@ -26,7 +26,8 @@
source='share_ldb.c',
subsystem='share',
init_function='share_ldb_init',
diff --git a/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch b/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
index dcd94e4..794b993 100644
--- a/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
+++ b/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
@@ -4,11 +4,9 @@ Bug-Debian: http://bugs.debian.org/598313
Forwarded: yes
Bug: https://bugzilla.samba.org/show_bug.cgi?id=7499
-Index: samba/lib/util/debug.c
-===================================================================
---- samba.orig/lib/util/debug.c
-+++ samba/lib/util/debug.c
-@@ -474,15 +474,17 @@
+--- a/lib/util/debug.c
++++ b/lib/util/debug.c
+@@ -475,15 +475,17 @@
if (state.logtype == DEBUG_FILE) {
#ifdef WITH_SYSLOG
@@ -32,10 +30,8 @@ Index: samba/lib/util/debug.c
#endif
}
}
-Index: samba/nsswitch/wins.c
-===================================================================
---- samba.orig/nsswitch/wins.c
-+++ samba/nsswitch/wins.c
+--- a/nsswitch/wins.c
++++ b/nsswitch/wins.c
@@ -52,7 +52,7 @@
lp_set_cmdline("log level", "0");
diff --git a/debian/patches/documentation2.patch b/debian/patches/documentation2.patch
deleted file mode 100644
index 583f615..0000000
--- a/debian/patches/documentation2.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 93777093055fe31d4f1ecf28bba79a489d83aac5 Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet at samba.org>
-Date: Sun, 26 May 2013 20:29:19 +1000
-Subject: [PATCH] docs: Remove all references to testprns
-
-Based on debian patch documentation2.patch by Christian Perrier <bubulle at debian.org>.
-
-This tool no longer exists in Samba.
-
-Andrew Bartlett
----
- docs-xml/manpages/nmbd.8.xml | 1 -
- docs-xml/manpages/smb.conf.5.xml | 1 -
- docs-xml/manpages/smbd.8.xml | 1 -
- docs-xml/using_samba/appd.xml | 18 ------------------
- docs-xml/using_samba/ch01.xml | 6 ------
- docs-xml/using_samba/ch07.xml | 8 --------
- examples/tridge/smb.conf | 8 --------
- 7 files changed, 43 deletions(-)
-
-diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
-index f666f58..0599ba3 100644
---- a/docs-xml/manpages/nmbd.8.xml
-+++ b/docs-xml/manpages/nmbd.8.xml
-@@ -266,7 +266,6 @@
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
-- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, and the Internet
- RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
- In addition the CIFS (formerly SMB) specification is available
-diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
-index 44411b0..dd4f858 100644
---- a/docs-xml/manpages/smb.conf.5.xml
-+++ b/docs-xml/manpages/smb.conf.5.xml
-@@ -809,7 +809,6 @@ chmod 1770 /usr/local/samba/lib/usershares
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
-- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>.</para>
- </refsect1>
-
-diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
-index 98e76fb..0d246cd 100644
---- a/docs-xml/manpages/smbd.8.xml
-+++ b/docs-xml/manpages/smbd.8.xml
-@@ -421,7 +421,6 @@
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
-- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, and the
- Internet RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
- In addition the CIFS (formerly SMB) specification is available
-diff --git a/docs-xml/using_samba/appd.xml b/docs-xml/using_samba/appd.xml
-index a3a23f8..018e590 100644
---- a/docs-xml/using_samba/appd.xml
-+++ b/docs-xml/using_samba/appd.xml
-@@ -1315,24 +1315,6 @@ received 6 names
-
-
-
--<sect2 role="" label="D.1.11" id="appd-SECT-1.11">
--<title>testprns</title>
--
--
--<para>The<indexterm id="appd-idx-993761-0"><primary>testprns program</primary></indexterm>
--<indexterm id="appd-idx-993761-1"><primary>printers</primary><secondary>names</secondary><tertiary>checking</tertiary></indexterm> <emphasis>testprns</emphasis> program checks a specified printer name against the system printer capabilities (<filename>printcap</filename>) file. Its command line is:</para>
--
--
--<programlisting>testprns <replaceable>printername</replaceable> [<replaceable>printcapname</replaceable>]</programlisting>
--
--
--<para>If the <literal>printcapname</literal> isn't specified, Samba attempts to use one located in the <filename>smb.conf</filename> file. If one isn't specified there, Samba will try <filename>/etc/printcap</filename>. If that fails, the program will generate an error.</para>
--</sect2>
--
--
--
--
--
- <sect2 role="" label="D.1.12" id="appd-SECT-1.12">
- <title>rpcclient</title>
-
-diff --git a/docs-xml/using_samba/ch01.xml b/docs-xml/using_samba/ch01.xml
-index ca8bc13..01d7791 100644
---- a/docs-xml/using_samba/ch01.xml
-+++ b/docs-xml/using_samba/ch01.xml
-@@ -1375,12 +1375,6 @@ SIMPLE <1E> GROUP Registered
- </varlistentry>
-
-
--<varlistentry><term>testprns</term>
--<listitem><para>A program that tests whether various printers are recognized by the <filename>smbd</filename> daemon</para></listitem>
--</varlistentry>
--</variablelist>
--
--
- <para>Each significant release of Samba goes through a significant exposure test before it's announced. In addition, it is quickly updated afterward if problems or unwanted side-effects are found. The latest stable distribution as of this writing is Samba 2.0.5, the long-awaited production version of Samba 2.0. This book focuses on the functionality supported in Samba 2.0, as opposed to the older 1.9.<emphasis>x</emphasis> versions of Samba, which are now obsolete.</para>
- </sect1>
-
-diff --git a/docs-xml/using_samba/ch07.xml b/docs-xml/using_samba/ch07.xml
-index 307cab7..988aab8 100644
---- a/docs-xml/using_samba/ch07.xml
-+++ b/docs-xml/using_samba/ch07.xml
-@@ -306,14 +306,6 @@ lppause command:
- public: true</programlisting>
-
-
--<para>Second, try the command <literal>testprns</literal> <replaceable>printername</replaceable>. This is a simple program that verifies that the specified printer is available in your <emphasis>printcap</emphasis> file. If your <emphasis>printcap</emphasis> file is not in the usual place, you can specify its full pathname as the second argument to the <emphasis>testprns</emphasis> command:</para>
--
--
--<programlisting># testprns lp /etc/printcap
--Looking for printer lp in printcap file /etc/printcap
--Printer name lp is valid.</programlisting>
--
--
- <para>Next, log on as the guest user, go to the spooling directory, and ensure that you can print using the same command that <emphasis>testparm</emphasis> says Samba will use. As mentioned before, this will tell you if you need to change the guest account, as the default account may not be allowed to print.</para>
-
-
-diff --git a/examples/tridge/smb.conf b/examples/tridge/smb.conf
-index a2f269f..4aa40d8 100644
---- a/examples/tridge/smb.conf
-+++ b/examples/tridge/smb.conf
-@@ -31,14 +31,6 @@
- print ok = yes
- print command = xmenu -heading "%s" OK&
-
--[testprn]
-- comment = Test printer
-- path = /tmp
-- user = susan
-- print ok = yes
-- print command = cp %s /tmp/smb.%U.prn
-- lpq command = cat /tmp/xxyz
--
- [amd]
- comment = amd area
- path = /mount
---
-1.7.11.7
-
diff --git a/debian/patches/series b/debian/patches/series
index b4f8f06..f8139c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,3 @@ smbclient-pager.patch
usershare.patch
VERSION.patch
waf_smbpasswd_location
-documentation2.patch
-0001-build-Install-smbtar-in-waf-build.patch
-0001-build-Add-missing-new-line-to-replaced-python-sheban.patch
-0001-heimdal-Remove-samba4kgetcred-again.patch
diff --git a/debian/patches/smbclient-pager.patch b/debian/patches/smbclient-pager.patch
index 54be14e..6c5a57e 100644
--- a/debian/patches/smbclient-pager.patch
+++ b/debian/patches/smbclient-pager.patch
@@ -3,11 +3,9 @@ Author: Steve Langasek <vorlon at debian.org>
Bug-Debian: http://bugs.debian.org/135603
Forwarded: not-needed
-Index: samba/source3/include/local.h
-===================================================================
---- samba.orig/source3/include/local.h
-+++ samba/source3/include/local.h
-@@ -113,7 +113,7 @@
+--- a/source3/include/local.h
++++ b/source3/include/local.h
+@@ -93,7 +93,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
#ifndef PAGER
diff --git a/debian/patches/usershare.patch b/debian/patches/usershare.patch
index e251494..7b32557 100644
--- a/debian/patches/usershare.patch
+++ b/debian/patches/usershare.patch
@@ -7,11 +7,9 @@ Bug-Debian: http://bugs.debian.org/443230
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
Forwarded: not-needed
-Index: experimental/docs/manpages/net.8
-===================================================================
---- experimental.orig/docs/manpages/net.8
-+++ experimental/docs/manpages/net.8
-@@ -800,9 +800,9 @@
+--- a/docs/manpages/net.8
++++ b/docs/manpages/net.8
+@@ -944,9 +944,9 @@
.RE
.SS "USERSHARE"
.PP
@@ -23,10 +21,8 @@ Index: experimental/docs/manpages/net.8
.PP
The usershare commands are:
.RS 4
-Index: experimental/source3/param/loadparm.c
-===================================================================
---- experimental.orig/source3/param/loadparm.c
-+++ experimental/source3/param/loadparm.c
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
@@ -1014,7 +1014,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
--
Debian packaging for Samba
More information about the Pkg-samba-maint
mailing list