summaryrefslogtreecommitdiff
path: root/packaging/Debian/debian-sarge
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/Debian/debian-sarge')
-rw-r--r--packaging/Debian/debian-sarge/changelog18
-rw-r--r--packaging/Debian/debian-sarge/patches/VERSION.patch8
-rw-r--r--packaging/Debian/debian-sarge/patches/fhs.patch53
-rw-r--r--packaging/Debian/debian-sarge/patches/version-fix-vscan.patch37
-rwxr-xr-xpackaging/Debian/debian-sarge/rules3
-rw-r--r--packaging/Debian/debian-sarge/samba.files1
6 files changed, 54 insertions, 66 deletions
diff --git a/packaging/Debian/debian-sarge/changelog b/packaging/Debian/debian-sarge/changelog
index 0f8f381d0f..9164a73ba4 100644
--- a/packaging/Debian/debian-sarge/changelog
+++ b/packaging/Debian/debian-sarge/changelog
@@ -1,3 +1,21 @@
+samba (3.0.21b-1) stable; urgency=high
+
+ * samba 3.0.21b Samba Team Release
+
+ -- Simo Sorce <idra@samba.org> Tue, 07 Feb 2006 16:45:30 -0500
+
+samba (3.0.21a-1) stable; urgency=high
+
+ * samba 3.0.21a Samba Team Release
+
+ -- Simo Sorce <idra@samba.org> Wed, 04 Jan 2006 16:10:30 -0500
+
+samba (3.0.21-1) stable; urgency=low
+
+ * samba 3.0.21 Samba Team Release
+
+ -- Simo Sorce <idra@samba.org> Wed, 21 Dec 2005 15:35:30 +0100
+
samba (3.0.20b-1) stable; urgency=low
* samba 3.0.20b Samba Team Release
diff --git a/packaging/Debian/debian-sarge/patches/VERSION.patch b/packaging/Debian/debian-sarge/patches/VERSION.patch
deleted file mode 100644
index efa7d85d4d..0000000000
--- a/packaging/Debian/debian-sarge/patches/VERSION.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- samba-3.0.0rc2/source/VERSION.orig 2003-09-02 21:56:11.000000000 -0400
-+++ samba-3.0.0rc2/source/VERSION 2003-09-02 21:56:30.000000000 -0400
-@@ -78,4 +78,4 @@
- # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
- # -> "CVS 3.0.0rc2-VendorVersion" #
- ########################################################
--SAMBA_VERSION_VENDOR_SUFFIX=
-+SAMBA_VERSION_VENDOR_SUFFIX="Debian"
diff --git a/packaging/Debian/debian-sarge/patches/fhs.patch b/packaging/Debian/debian-sarge/patches/fhs.patch
index 0790c17b2f..957ce7fae9 100644
--- a/packaging/Debian/debian-sarge/patches/fhs.patch
+++ b/packaging/Debian/debian-sarge/patches/fhs.patch
@@ -151,13 +151,13 @@ diff -uNr samba-3.0.10.orig/source/intl/lang_tdb.c samba-3.0.10/source/intl/lang
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
-diff -uNr samba-3.0.10.orig/source/lib/account_pol.c samba-3.0.10/source/lib/account_pol.c
---- samba-3.0.10.orig/source/lib/account_pol.c 2004-12-17 03:50:08.000000000 -0800
-+++ samba-3.0.10/source/lib/account_pol.c 2004-12-17 03:55:29.000000000 -0800
-@@ -35,7 +35,7 @@
-
- if (tdb)
+diff -uNr samba-3.0.21.orig/source/lib/account_pol.c samba-3.0.21/source/lib/account_pol.c
+--- samba-3.0.21.orig/source/lib/account_pol.c 2005-12-20 15:28:38.000000000 +0000
++++ samba-3.0.21/source/lib/account_pol.c 2005-12-23 11:41:08.000000000 +0000
+@@ -262,7 +262,7 @@
return True;
+ }
+
- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
if (!tdb) {
@@ -448,26 +448,39 @@ diff -uNr samba-3.0.10.orig/source/printing/printing_db.c samba-3.0.10/source/pr
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-diff -uNr samba-3.0.20b.orig/source/registry/reg_db.c samba-3.0.20b/source/registry/reg_db.c
---- samba-3.0.20b.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.20b/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500
-@@ -198,13 +198,13 @@
- if ( tdb_reg )
- return True;
-
+diff -uNr samba-3.0.21.orig/source/registry/reg_db.c samba-3.0.21/source/registry/reg_db.c
+--- samba-3.0.21.orig/source/registry/reg_db.c 2005-10-18 02:45:06.000000000 +0000
++++ samba-3.0.21/source/registry/reg_db.c 2005-12-23 11:48:19.000000000 +0000
+@@ -205,12 +205,12 @@
+ if ( tdb_reg )
+ return True;
+
- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
- {
+ {
- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- if ( !tdb_reg ) {
- DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+ if ( !tdb_reg ) {
+ DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
- lock_path("registry.tdb"), strerror(errno) ));
+ state_path("registry.tdb"), strerror(errno) ));
- return False;
- }
-
- DEBUG(10,("init_registry: Successfully created registry tdb\n"));
+ return False;
+ }
+
+@@ -252,11 +252,11 @@
+
+ become_root();
+
+- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
++ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+ if ( !tdb_reg ) {
+ result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
+ DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
+- lock_path("registry.tdb"), strerror(errno) ));
++ state_path("registry.tdb"), strerror(errno) ));
+ }
+
+ unbecome_root();
diff -uNr samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c
--- samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:50:09.000000000 -0800
+++ samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:55:31.000000000 -0800
diff --git a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch
deleted file mode 100644
index 0f35598297..0000000000
--- a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Lars Mueller <lmuelle at SuSE dot de>
-Subject: Non integer SAMBA_VERSION_RELEASE breaks samba-vscan build
-Bugzilla: bugzilla.Samba.org #2618
-
---- samba-3.0.20b/source/script/mkversion.sh
-+++ samba-3.0.20b/source/script/mkversion.sh 2005-10-22 12:56:30
-@@ -17,6 +17,7 @@
- SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE`
- SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
- SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_RELEASE_SUFFIX=`sed -n 's/^SAMBA_VERSION_RELEASE_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
-
- SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-
-@@ -31,9 +32,10 @@
- echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE
- echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
- echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
-+echo "#define SAMBA_VERSION_RELEASE_SUFFIX ${SAMBA_VERSION_RELEASE_SUFFIX}" >> $OUTPUT_FILE
-
-
--SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
-+SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${SAMBA_VERSION_RELEASE_SUFFIX}"
-
-
- if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
---- samba-3.0.20b/source/VERSION
-+++ samba-3.0.20b/source/VERSION 2005-10-22 12:56:30
-@@ -19,7 +19,8 @@
- ########################################################
- SAMBA_VERSION_MAJOR=3
- SAMBA_VERSION_MINOR=0
- SAMBA_VERSION_RELEASE=20
-+SAMBA_VERSION_RELEASE_SUFFIX=b
-
- ########################################################
- # For 'pre' releases the version will be #
diff --git a/packaging/Debian/debian-sarge/rules b/packaging/Debian/debian-sarge/rules
index 25e598d185..4db1aafd3a 100755
--- a/packaging/Debian/debian-sarge/rules
+++ b/packaging/Debian/debian-sarge/rules
@@ -69,6 +69,7 @@ conf_args = \
--with-automount \
--with-tdbsam \
--with-ldap \
+ --with-shared-modules=idmap_ad,idmap_rid \
--with-python=python2.3
ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
@@ -229,7 +230,7 @@ endif
# The smbwrapper package is not being generated anymore, so we must
# delete the related man pages.
- rm $(DESTDIR)/usr/share/man/man1/smbsh.1
+ # rm $(DESTDIR)/usr/share/man/man1/smbsh.1
# We're not providing findsmb (should we?) so let's remove the man
# pages.
diff --git a/packaging/Debian/debian-sarge/samba.files b/packaging/Debian/debian-sarge/samba.files
index 163a25b173..874a8d66f3 100644
--- a/packaging/Debian/debian-sarge/samba.files
+++ b/packaging/Debian/debian-sarge/samba.files
@@ -6,6 +6,7 @@ usr/sbin/smbd
usr/sbin/nmbd
usr/sbin/mksmbpasswd
usr/lib/samba/vfs
+usr/lib/samba/idmap
usr/share/man/man1/smbcontrol.1
usr/share/man/man1/smbstatus.1
usr/share/man/man5/smbpasswd.5
generated by cgit (git 2.34.1) at 2024-11-24 19:29:09 +0000