OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-May-2007 08:38:14
Branch: HEAD Handle: 2007051907381400
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
upgrading package: samba 3.0.24 -> 3.0.25
Summary:
Revision Changes Path
1.18 +200 -203 openpkg-src/samba/samba.patch
1.113 +2 -2 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 samba.patch
--- openpkg-src/samba/samba.patch 11 Dec 2006 08:49:56 -0000 1.17
+++ openpkg-src/samba/samba.patch 19 May 2007 06:38:14 -0000 1.18
@@ -1,7 +1,7 @@
Index: source/Makefile.in
---- source/Makefile.in.orig 2006-11-14 15:42:15 +0100
-+++ source/Makefile.in 2006-12-10 17:12:55 +0100
-@@ -86,7 +86,7 @@
+--- source/Makefile.in.orig 2007-04-25 11:39:00 +0200
++++ source/Makefile.in 2007-05-17 14:43:04 +0200
+@@ -92,7 +92,7 @@
# or in smb.conf (see smb.conf(5))
LOGFILEBASE = @logfilebase@
CONFIGFILE = $(CONFIGDIR)/smb.conf
@@ -10,352 +10,349 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -922,46 +922,46 @@
+@@ -965,26 +965,26 @@
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS)
\
+ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@
+- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@
+ $(ACL_LIBS) $(PASSDB_LIBS) @POPTLIBS@ @SMBD_LIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP)
$(PRINT_LIBS) \
+ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
- $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS)
$(LDAP_LIBS)
+ $(AUTH_LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
$(LIBS)
- bin/[EMAIL PROTECTED]@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(RPCCLIENT_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(PASSDB_LIBS)
$(RPCCLIENT_OBJ) \
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
- $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
- $(KRB5LIBS) $(LDAP_LIBS)
+ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ \
+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS)
$(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS)
$(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin
-lsmbclient
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin
-lsmbclient $(LIBS)
+@@ -992,19 +992,19 @@
- bin/[EMAIL PROTECTED]@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(NET_OBJ) @BUILD_POPT@
@BUILD_INIPARSER@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS)
$(TERMLIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
$(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS)
$(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@
++ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
$(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
$(NSCD_LIBS) @INIPARSERLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(CUPS_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(CUPS_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(MOUNT_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(MOUNT_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(MNT_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(MNT_OBJ) bin/.dummy
@echo Linking $@
-@@ -981,47 +981,47 @@
+@@ -1024,52 +1024,52 @@
- bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS)
$(DYNEXP) @POPTLIBS@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) \
+- @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) \
- @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) \
++ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS) \
+ @POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBCONTROL_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
- @$(CC) -DUSING_SMBCONTROL $(FLAGS) @PIE_LDFLAGS@ -o $@ \
+ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-- $(LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
-+ @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS)
+- $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
++ $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBPASSWD_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBPASSWD_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS)
$(PASSDB_LIBS) \
+ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
- $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+ $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SAMTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SAMTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(NMBLOOKUP_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(NMBLOOKUP_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) @POPTLIBS@ $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS)
$(DYNEXP) @POPTLIBS@ $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBTORTURE_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS)
$(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(TALLOCTORT_OBJ) bin/.dummy
@echo Linking $@
-@@ -1029,41 +1029,41 @@
+ @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
+- $(DYNEXP) $(LIBS) $(LDAP_LIBS)
++ $(DYNEXP) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(MASKTEST_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: $(REPLACETORT_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MASKTEST_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MASKTEST_OBJ) $(LDFLAGS)
$(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+@@ -1078,49 +1078,49 @@
- bin/[EMAIL PROTECTED]@: $(MSGTEST_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(MASKTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(MSGTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ \
+- @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ \
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ \
++ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBCQUOTAS_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ \
+- @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ \
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ \
++ @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
\
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@
bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS)
$(LDAP_LIBS) @POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST_OBJ) $(LDFLAGS)
$(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(NSSTEST_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(NSSTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(PDBTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-@@ -1071,11 +1071,11 @@
+- @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(LOCKTEST2_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS)
$(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(RPCTORTURE_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(RPCTORTURE_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(RPCTORTURE_OBJ) $(DYNEXP)
$(LDFLAGS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+@@ -1128,11 +1128,11 @@
- bin/[EMAIL PROTECTED]@: $(DEBUG2HTML_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST2_OBJ) bin/.dummy
@echo Linking $@
-@@ -1083,11 +1083,11 @@
+- @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBFILTER_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: $(RPCTORTURE_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBW_OBJ) utils/smbw_sample.o
$(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBW_OBJ) utils/smbw_sample.o
$(LDFLAGS) $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+@@ -1140,13 +1140,13 @@
- bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
-@@ -1095,15 +1095,15 @@
+- @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS)
$(LDAP_LIBS)
++ @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
- @echo Linking shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) \
- $(KRB5LIBS) $(LDAP_LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED]
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS)
+ bin/[EMAIL PROTECTED]@: proto_exists $(LIBADDNS_OBJ)
+ @echo Linking libaddns shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) \
+ $(KRB5LIBS) $(UUID_LIBS)\
+- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBADDNS_MAJOR)
++ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBADDNS_MAJOR) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
+ bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
+ @echo Linking libaddns non-shared library $@
+@@ -1154,9 +1154,9 @@
+
+ bin/[EMAIL PROTECTED]@: proto_exists $(LIBSMBCLIENT_OBJ)
@echo Linking libsmbclient shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) \
- $(KRB5LIBS) $(LDAP_LIBS) \
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) \
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR) $(LIBS)
- bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
+ bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
@echo Linking libsmbclient non-shared library $@
-@@ -1111,9 +1111,9 @@
+@@ -1164,9 +1164,9 @@
- bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
+ bin/[EMAIL PROTECTED]@: proto_exists $(LIBSMBSHAREMODES_OBJ)
@echo Linking libsmbsharemodes shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS)
$(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) \
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) \
$(KRB5LIBS) $(LDAP_LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
$(LIBS)
++ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
$(LIBS)
- bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
+ bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODES_OBJ)
@echo Linking libsmbsharemodes non-shared library $@
-@@ -1121,8 +1121,8 @@
+@@ -1174,8 +1174,8 @@
- bin/[EMAIL PROTECTED]@: $(CAC_PICOBJS)
+ bin/[EMAIL PROTECTED]@: proto_exists $(CAC_OBJ)
@echo Linking libmsrpc shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR) $(LIBS)
- bin/libmsrpc.a: $(CAC_PICOBJS)
+ bin/libmsrpc.a: proto_exists $(CAC_OBJ)
@echo Linking libmsrpc non-shared library $@
-@@ -1131,9 +1131,9 @@
- # This is probably wrong for anything other than the GNU linker.
- bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
+@@ -1184,9 +1184,9 @@
+ # This is probably wrong for anything other than the GNU linker.
+ bin/[EMAIL PROTECTED]@: proto_exists $(LIBBIGBALLOFMUD_OBJ)
@echo Linking bigballofmud shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) \
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
$(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
$(LIBS)
ln -snf libbigballofmud.so bin/libbigballofmud.so.0
# It would be nice to build a static bigballofmud too, but when I try
-@@ -1212,8 +1212,8 @@
+@@ -1276,8 +1276,8 @@
- bin/[EMAIL PROTECTED]@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@echo "Linking $@"
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) \
+- @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) \
++ @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) \
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
- # Please don't add .o files to libnss_winbind, libnss_wins, or the
pam_winbind
- # libraries. Add to the appropriate PICOBJ variable instead.
-@@ -1375,54 +1375,54 @@
+ @WINBIND_NSS@: $(WINBIND_NSS_OBJ)
+ @echo "Linking $@"
+@@ -1287,14 +1287,14 @@
+ @WINBIND_WINS_NSS@: proto_exists $(WINBIND_WINS_NSS_OBJ)
+ @echo "Linking $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@
++ $(LDAP_LIBS) $(KRB5LIBS) \
++ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@
$(LIBS)
+
+ @SMB_KRB5_LOCATOR@: proto_exists $(SMB_KRB5_LOCATOR_OBJ)
+ @echo "Linking $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(SMB_KRB5_LOCATOR_OBJ) \
+- $(LDAP_LIBS) $(LIBS) -lcom_err \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED]
++ $(LDAP_LIBS) -lcom_err \
++ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS)
- bin/[EMAIL PROTECTED]@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
+ bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_OBJ) bin/.dummy
+ @echo "Linking shared library $@"
+@@ -1515,30 +1515,30 @@
+
+ bin/[EMAIL PROTECTED]@: proto_exists $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP)
$(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP)
@POPTLIBS@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
- bin/[EMAIL PROTECTED]@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+ bin/[EMAIL PROTECTED]@: proto_exists $(NTLM_AUTH_OBJ) $(PARAM_OBJ)
$(LIB_NONSMBD_OBJ) \
@BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(NTLM_AUTH_OBJ) \
+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_PICOOBJ)
+ bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_OBJ)
@echo "Linking shared library $@"
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP)
$(LIBS) $(LDAP_LIBS) $(KRB5LIBS)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP)
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS)
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS)
$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP)
$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBBACKUP_OBJ) @SOCKWRAP@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(TDBBACKUP_OBJ) @SOCKWRAP@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ)
++ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBBACKUP_OBJ) $(LIBS)
bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBTOOL_OBJ) @SOCKWRAP@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ)
@SOCKWRAP@ $(LIBS)
+- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ)
++ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ) $(LIBS)
bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBDUMP_OBJ) @SOCKWRAP@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ)
@SOCKWRAP@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o
-L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strcmp.o -L
./bin -lbigballofmud $(LIBS)
-
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strstr.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strstr.o
-L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strstr.o -L
./bin -lbigballofmud $(LIBS)
-
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strappend.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_strappend.o -L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strappend.o -L
./bin -lbigballofmud $(LIBS)
-
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_stringoverflow.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o
-L./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o
-L./bin -lbigballofmud $(LIBS)
-
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_doschar.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_doschar.o -L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP)torture/t_doschar.o -L
./bin -lbigballofmud $(LIBS)
- bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_push_ucs2.o
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_push_ucs2.o -L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_push_ucs2.o -L
./bin -lbigballofmud $(LIBS)
-
- bin/[EMAIL PROTECTED]@: lib/snprintf.c
-- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF
lib/snprintf.c -lm
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF
lib/snprintf.c -lm $(LIBS)
-
- bin/[EMAIL PROTECTED]@: script/tests/timelimit.o
- @echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
$(LIBS)
-
- install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
+- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ)
++ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ) $(LIBS)
-@@ -1513,7 +1513,7 @@
+ bin/[EMAIL PROTECTED]@: proto_exists bin/[EMAIL PROTECTED]@
torture/t_strcmp.o
+ $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin
-lbigballofmud
+@@ -1661,7 +1661,7 @@
fi
- PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+ PYTHON_OBJS="$(PYTHON_OBJ)" \
PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
- LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS)
$(LDAP_LIBS)" \
+ LIBS="$(LDFLAGS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
$(LIBS)" \
$(PYTHON) python/setup.py build
- python_install: $(PYTHON_PICOBJS)
+ python_install: $(PYTHON_OBJ)
Index: source/lib/sysquotas_4A.c
--- source/lib/sysquotas_4A.c.orig 2005-09-29 23:52:43 +0200
-+++ source/lib/sysquotas_4A.c 2006-12-10 17:08:04 +0100
++++ source/lib/sysquotas_4A.c 2007-05-17 14:40:34 +0200
@@ -72,6 +72,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ -368,9 +365,9 @@
#define USERQUOTAFILE_EXTENSION ".user"
#else
Index: source/nsswitch/winbindd_util.c
---- source/nsswitch/winbindd_util.c.orig 2006-11-14 15:42:13 +0100
-+++ source/nsswitch/winbindd_util.c 2006-12-10 17:08:04 +0100
-@@ -935,7 +935,7 @@
+--- source/nsswitch/winbindd_util.c.orig 2007-05-11 00:09:34 +0200
++++ source/nsswitch/winbindd_util.c 2007-05-17 14:40:34 +0200
+@@ -936,7 +936,7 @@
{
if (_winbindd_priv_socket == -1) {
_winbindd_priv_socket = create_pipe_sock(
@@ -380,9 +377,9 @@
_winbindd_priv_socket));
}
Index: source/smbd/uid.c
---- source/smbd/uid.c.orig 2006-04-20 04:29:19 +0200
-+++ source/smbd/uid.c 2006-12-10 17:08:04 +0100
-@@ -152,6 +152,10 @@
+--- source/smbd/uid.c.orig 2007-03-01 05:54:07 +0100
++++ source/smbd/uid.c 2007-05-17 14:40:34 +0200
+@@ -157,6 +157,10 @@
BOOL must_free_token = False;
NT_USER_TOKEN *token = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 samba.spec
--- openpkg-src/samba/samba.spec 10 Feb 2007 23:06:58 -0000 1.112
+++ openpkg-src/samba/samba.spec 19 May 2007 06:38:14 -0000 1.113
@@ -32,8 +32,8 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 3.0.24
-Release: 20070211
+Version: 3.0.25
+Release: 20070519
# package options
%option with_pam no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
