[Pkg-samba-maint] r3013 - in trunk/samba/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sun Aug 30 18:26:30 UTC 2009
Author: bubulle
Date: 2009-08-30 18:26:29 +0000 (Sun, 30 Aug 2009)
New Revision: 3013
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/README_nosmbldap-tools.patch
trunk/samba/debian/patches/VERSION.patch
trunk/samba/debian/patches/codepages-location.patch
trunk/samba/debian/patches/documentation.patch
trunk/samba/debian/patches/fhs-filespaths.patch
trunk/samba/debian/patches/fix-manpages-warnings.patch
trunk/samba/debian/patches/installswat.sh.patch
trunk/samba/debian/patches/no-unnecessary-cups.patch
trunk/samba/debian/patches/pam-examples.patch
trunk/samba/debian/patches/shrink-dead-code.patch
trunk/samba/debian/patches/smbclient-pager.patch
trunk/samba/debian/patches/smbtar-bashism.patch
trunk/samba/debian/patches/undefined-symbols.patch
trunk/samba/debian/patches/usershare.patch
Log:
Use DEP-3 for all patches
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/changelog 2009-08-30 18:26:29 UTC (rev 3013)
@@ -20,8 +20,7 @@
patch. Closes: #541367.
[ Christian Perrier ]
- * Use DEP-3 for patches meta-information:
- - adapt_machine_creation_script.patch
+ * Use DEP-3 for patches meta-information
-- Steve Langasek <vorlon at debian.org> Sun, 23 Aug 2009 22:35:16 -0700
Modified: trunk/samba/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/samba/debian/patches/README_nosmbldap-tools.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/README_nosmbldap-tools.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,8 @@
-Goal: Amend the LDAP/README example as smbldap-tools are packaged separately
+Description: Mention smbldap-tools package in examples/LDAP/README
+Author: Christian Perrier <bubulle at debian.org>
+Bug-Debian: http://bugs.debian.org/341934
+Forwarded: not-needed
-Fixes: #341934
-
-Status wrt upstream: Debian specific
-
-Note:
-
Index: samba-3.3.0rc2/examples/LDAP/README
===================================================================
--- samba-3.3.0rc2.orig/examples/LDAP/README
Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/VERSION.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,7 @@
-Goal: Add "Debian" as vendor suffix
+Description: Add "Debian" as vendor suffix
+Author: Eloy A. Paris <peloy at debian.org>
+Forwarded: not-needed
-Fixes: nothing
-
-Status wrt upstream: Debian specific
-
-Note: Should be kept
-
Index: samba-3.3.0rc2/source3/VERSION
===================================================================
--- samba-3.3.0rc2.orig/source3/VERSION
Modified: trunk/samba/debian/patches/codepages-location.patch
===================================================================
--- trunk/samba/debian/patches/codepages-location.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/codepages-location.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,9 @@
-Goal: Move codepage files to the datadir (codepagedir is not configurable)
+Description: Move codepage files to the datadir
+ "codepagedir" is not configurable and the leads to build failures.
+Author: Christian Perrier <bubulle at debian.org>
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=6444
+Forwarded: yes
-Fixes: Build failure..:-)
-
-Status wrt upstream: Forwarded as Bugzilla #6444
-
-Note:
-
Index: samba-3.4.0pre1/source3/Makefile.in
===================================================================
--- samba-3.4.0pre1.orig/source3/Makefile.in
Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/documentation.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,7 @@
-Goal: Remove documentation parts that do not apply to Debian
+Description: Remove documentation parts that do not apply to Debian
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: not-needed
-Fixes: many minor reported issues and remarks gathered here and there
-
-Status wrt upstream: Debian specific
-
-Note:
-
Index: samba-3.3.0/docs/manpages/swat.8
===================================================================
--- samba-3.3.0.orig/docs/manpages/swat.8
Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/fhs-filespaths.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,15 +1,18 @@
-Goal: Prepare the sources to better respect FHS
+Description: Prepare the sources to better respect FHS
+ This patch was historically very long but most parts have
+ been integrated upstream.
+ .
+ The last remaining bit is the location of "private files
+ We historically have them in /var/lib/samba while upstream
+ has them in /etc/samba
+ .
+ We need to provide a migraiton path and go back to the "normal"
+ file layout
+Author: Eloy A. Paris <peloy at debian.org>
+Bug-Debian: http://bugs.debian.org/49011
+Forwarded: not-needed
-Fixes: #49011
-Status wrt upstream: Everything is applied as of 3.4.0
-
-Note: The last remaining bit is the location of "private files
- We historically have them in /var/lib/samba while upstream
- has them in /etc/samba
- We need to provide a migraiton path and go back to the "normal"
- file layout
-
Index: samba-3.3.0rc2/source3/passdb/pdb_tdb.c
===================================================================
--- samba-3.3.0rc2.orig/source3/passdb/pdb_tdb.c
Modified: trunk/samba/debian/patches/fix-manpages-warnings.patch
===================================================================
--- trunk/samba/debian/patches/fix-manpages-warnings.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/fix-manpages-warnings.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,3 +1,7 @@
+Description: Fix warnings in manpages
+ Lintian report non-existing macros in manpages.
+Author: Christian Perrier <bubulle at debian.org>
+
Index: samba-3.3.0/docs/manpages/cifs.upcall.8
===================================================================
--- samba-3.3.0.orig/docs/manpages/cifs.upcall.8
Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/installswat.sh.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,9 @@
-Goal: Do not install the Using Samba book when installing SWAT
+Description: Do not install the Using Samba book when installing SWAT
+ Using Samba is packaged in samba-doc, however upstream also
+ installs it in SWAT install dirs
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: not-needed
-Fixes:
-
-Status wrt upstream: Debian specific
-
-Note:
-
Index: samba-3.3.0rc2/source3/script/installswat.sh
===================================================================
--- samba-3.3.0rc2.orig/source3/script/installswat.sh
Modified: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,10 +1,11 @@
-Goal: Don't try to contact the CUPS server when we can reliably
-determine that no printers are needed
+Description: Drop unneeded calls to CUPS server
+ Don't try to contact the CUPS server when we can reliably
+ determine that no printers are needed
+Author: Steve Langasek <vorlon at debian.org>
+Bug-Debian: http://bugs.debian.org/479512
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
+Forwarded: yes
-Fixes: bug #479512
-
-Upstream status: submitted as bugzilla bug #5525
-
Index: samba-3.3.0rc2/source3/smbd/server.c
===================================================================
--- samba-3.3.0rc2.orig/source3/smbd/server.c
Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/pam-examples.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,11 +1,7 @@
-Goal: The pam_smbpass examples are not in samples/ but examples/
+Description: Fix examples directory location in pam_smbpass README
+Author: Christian Perrier <bubulle at debian.org>
+Forwarded: not-needed
-Fixes: ?
-
-Status wrt upstream: Debian specific
-
-Note:
-
Index: samba-3.3.0rc2/source3/pam_smbpass/README
===================================================================
--- samba-3.3.0rc2.orig/source3/pam_smbpass/README
Modified: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/shrink-dead-code.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,21 +1,21 @@
-Comment by Michael Adam <obnox at samba.org>:
+Description: Drop dead code from executables
+ Comment by Michael Adam:
+ .
+ While this patch is clever in one respect, it has bad side effects:
+ Functions that not used are removed from the binaries.
+ For functions that are only used in shared objects, this is very bad,
+ since these will refuse to work (load).
+ .
+ Example: librpc/gen_ndr/ndr_xattr.c:ndr_pull_xattr_NTACL() is only
+ used in the acl_tdb and acl_xattr vfs modules.
+ So the symbol is not present in smbd, and thus these modules will
+ not work. The _do_ not work in the 3.3. packages that are out there.
+ .
+ I recommend not using this patch!
+Author: Steve Langasek <vorlon at debian.org>
+Forwarded: no
+Reviewed-By: Michael Adam <obnox at samba.org>
-While this patch is clever in one respect, it has bad side effects:
-Functions that not used are removed from the binaries.
-For functions that are only used in shared objects, this is very bad,
-since these will refuse to work (load).
-
-Example: librpc/gen_ndr/ndr_xattr.c:ndr_pull_xattr_NTACL() is only
-used in the acl_tdb and acl_xattr vfs modules.
-So the symbol is not present in smbd, and thus these modules will
-not work. The _do_ not work in the 3.3. packages that are out there.
-
-I recommend not using this patch!
-
-Better reduction is done by fixing the linking dependencies... :-(
-
-Michael
-
Index: samba-3.3.4/source3/Makefile.in
===================================================================
--- samba-3.3.4.orig/source3/Makefile.in 2009-05-02 14:33:23.654935629 +0200
Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/smbclient-pager.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,13 +1,8 @@
-Goal: Use the pager alternative as pager is PAGER is undefined
-
-Fixes: #125603
-
-Status wrt upstream: Debian specific
-
+Description: Use the pager alternative as pager is PAGER is undefined
Author: Steve Langasek <vorlon at debian.org>
+Bug-Debian: http://bugs.debian.org/135603
+Forwarded: not-needed
-Note:
-
Index: samba-3.3.0rc2/source3/include/local.h
===================================================================
--- samba-3.3.0rc2.orig/source3/include/local.h
Modified: trunk/samba/debian/patches/smbtar-bashism.patch
===================================================================
--- trunk/samba/debian/patches/smbtar-bashism.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/smbtar-bashism.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,13 +1,8 @@
-Goal: Avoid using bashism in smbtar
-
-Status wrt upstream: Debian-specific.
-
-Fixes: #486056
-
+Description: Avoid using bashism in smbtar
Author: Jelmer Vernooij <jelmer at samba.org>
+Bug-Debian: http://bugs.debian.org/486056
+Forwarded: no
-Note:
-
Index: samba-3.3.0rc2/source3/script/smbtar
===================================================================
--- samba-3.3.0rc2.orig/source3/script/smbtar
Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/undefined-symbols.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,14 +1,14 @@
-Goal: Fix missing symbols in libsmbclient (and libnss_wins), and add
- -Wl,-z,defs to the libsmbclient link options to prevent future
- instances of undefined symbols
+Description: Fix missing symbols
+ Fix missing symbols in libsmbclient (and libnss_wins), and add
+ -Wl,-z,defs to the libsmbclient link options to prevent future
+ instances of undefined symbols.
+ .
+ This should be forwarded upstream once there's a configure test
+ for it.
+Author: Steve Langasek <vorlon at debian.org>
+Bug-Debian: http://bugs.debian.org/281181
+Forwarded: no
-Fixes: #281181
-
-Status wrt upstream: Not forwarded. Should be once there is a configure test
-for it.
-
-Note:
-
Index: samba-3.4.0~pre1/source3/Makefile.in
===================================================================
--- samba-3.4.0~pre1.orig/source3/Makefile.in 2009-05-09 20:36:33.735433063 +0200
Modified: trunk/samba/debian/patches/usershare.patch
===================================================================
--- trunk/samba/debian/patches/usershare.patch 2009-08-30 16:44:50 UTC (rev 3012)
+++ trunk/samba/debian/patches/usershare.patch 2009-08-30 18:26:29 UTC (rev 3013)
@@ -1,13 +1,12 @@
-Goal: enable net usershares by default at build time, with a limit of
-100, and update the corresponding documentation
+Description: Enable net usershares by default at build time
+ Enable net usershares by default at build time, with a limit of
+ 100, and update the corresponding documentation.
+Author: Mathias Gug <mathiaz at ubuntu.com>,
+Author: Steve Langasek <vorlon at debian.org>
+Bug-Debian: http://bugs.debian.org/443230
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
+Forwarded: not-needed
-Fixes: Debian bug #443230
-
-Authors: Mathias Gug <mathiaz at ubuntu.com>,
- Steve Langasek <vorlon at debian.org>
-
-Status wrt upstream: Debian-specific
-
Index: samba-3.3.0/docs/manpages/net.8
===================================================================
--- samba-3.3.0.orig/docs/manpages/net.8
More information about the Pkg-samba-maint
mailing list