summaryrefslogtreecommitdiff
path: root/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
diff options
context:
space:
mode:
authorEloy Paris <peloy@samba.org>2003-07-15 17:22:38 +0000
committerEloy Paris <peloy@samba.org>2003-07-15 17:22:38 +0000
commit4a12fe6044229cc5f59bd5029309ba9fe331b214 (patch)
tree582683bfb7da617aad2fd4a40ed323c52dfab2cc /packaging/Debian/debian/patches/pam_smbpass_linkage.patch
parent8c4be2bbc9d1b42ae1b26a3a2519dd2c911dee45 (diff)
downloadsamba-4a12fe6044229cc5f59bd5029309ba9fe331b214.tar.gz
samba-4a12fe6044229cc5f59bd5029309ba9fe331b214.tar.bz2
samba-4a12fe6044229cc5f59bd5029309ba9fe331b214.zip
Debian updates. Brings files in packaging/Debian on par with the
latest Debian official packages for Debian unstable. Also fixes patches that got out of date in the beta2->beta3 development process. (This used to be commit 03871fd574bf9c0f6d88c96423f77e9ada7b16f7)
Diffstat (limited to 'packaging/Debian/debian/patches/pam_smbpass_linkage.patch')
-rw-r--r--packaging/Debian/debian/patches/pam_smbpass_linkage.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
index 3d1fab8ab0..022a3a0a28 100644
--- a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
+++ b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
@@ -1,20 +1,18 @@
-diff -ur samba-3.0.0beta1.orig/source/Makefile.in samba-3.0.0beta1/source/Makefile.in
---- samba-3.0.0beta1.orig/source/Makefile.in 2003-06-16 23:59:19.000000000 -0500
-+++ samba-3.0.0beta1/source/Makefile.in 2003-06-17 00:13:50.000000000 -0500
-@@ -582,9 +582,9 @@
-
+diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
+--- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-05 16:24:34.000000000 -0500
++++ samba-3.0.0beta2/source/Makefile.in 2003-07-05 16:24:54.000000000 -0500
+@@ -579,8 +579,8 @@
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
-- libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \
+ libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \
- $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-- $(SECRETS_OBJ) $(UBIQX_OBJ) $(IDMAP_OBJ)
+- $(SECRETS_OBJ) $(UBIQX_OBJ)
+ $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \
-+ $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(IDMAP_OBJ) \
-+ $(SMBLDAP_OBJ)
++ $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(SMBLDAP_OBJ)
PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
-@@ -1080,7 +1080,8 @@
+@@ -1076,7 +1076,8 @@
bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
@echo "Linking shared library $@"