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: 26-Nov-2005 17:09:49
Branch: HEAD Handle: 2005112616094900
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
fix LDAP support and add LDAP/Kerberos-based ADS support; fix winbindd
subst
Summary:
Revision Changes Path
1.10 +243 -17 openpkg-src/samba/samba.patch
1.94 +29 -6 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 samba.patch
--- openpkg-src/samba/samba.patch 29 Sep 2005 21:47:45 -0000 1.9
+++ openpkg-src/samba/samba.patch 26 Nov 2005 16:09:49 -0000 1.10
@@ -1,21 +1,235 @@
-Allow others to connect to the winbindd(8) socket.
-
-Index: source/nsswitch/winbindd_util.c
---- source/nsswitch/winbindd_util.c.orig 2004-07-20 18:28:01 +0200
-+++ source/nsswitch/winbindd_util.c 2004-07-28 14:54:12 +0200
-@@ -682,7 +682,7 @@
- {
- if (_winbindd_priv_socket == -1) {
- _winbindd_priv_socket = create_pipe_sock(
-- get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0750);
-+ get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0755);
- DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n",
- _winbindd_priv_socket));
- }
+Index: source/Makefile.in
+--- source/Makefile.in.orig 2005-10-12 19:03:23 +0200
++++ source/Makefile.in 2005-11-26 16:11:16 +0100
+@@ -833,7 +833,7 @@
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+@@ -842,21 +842,21 @@
+ bin/[EMAIL PROTECTED]@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -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
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -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
+ @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)
+
+ bin/[EMAIL PROTECTED]@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+@@ -864,11 +864,11 @@
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(MNT_OBJ) bin/.dummy
+ @echo Linking $@
+@@ -895,32 +895,32 @@
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(SMBPASSWD_OBJ) bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS)
$(PASSDB_LIBS) \
+- $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
++ $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_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)
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(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)
+
+ bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy
+ @echo Linking $@
+@@ -928,31 +928,31 @@
+
+ bin/[EMAIL PROTECTED]@: $(MASKTEST_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)
+
+ bin/[EMAIL PROTECTED]@: $(MSGTEST_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)
+
+ bin/[EMAIL PROTECTED]@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) 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)
+
+ bin/[EMAIL PROTECTED]@: $(NSSTEST_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)
+
+ bin/[EMAIL PROTECTED]@: $(VFSTEST_OBJ) @BUILD_POPT@ 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)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+@@ -964,11 +964,11 @@
+
+ bin/[EMAIL PROTECTED]@: $(LOCKTEST2_OBJ) 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)
+
+ bin/[EMAIL PROTECTED]@: $(RPCTORTURE_OBJ) 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)
+
+ bin/[EMAIL PROTECTED]@: $(DEBUG2HTML_OBJ) bin/.dummy
+ @echo Linking $@
+@@ -976,11 +976,11 @@
+
+ bin/[EMAIL PROTECTED]@: $(SMBFILTER_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)
+
+ bin/[EMAIL PROTECTED]@: $(SMBW_OBJ) utils/smbw_sample.o 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)
+
+ bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
+ @echo Linking $@
+@@ -988,14 +988,14 @@
+
+ bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
+ @echo Linking shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
+- $(KRB5LIBS) $(LDAP_LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) \
++ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
+ bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
+ @echo Linking libsmbclient shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
+- $(KRB5LIBS) $(LDAP_LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) \
++ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
+
+ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
+@@ -1004,8 +1004,8 @@
+
+ bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
+ @echo Linking libsmbsharemodes shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS)
$(LIBS) \
+- $(KRB5LIBS) $(LDAP_LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) \
++ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
+
+ bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
+@@ -1015,8 +1015,8 @@
+ # This is probably wrong for anything other than the GNU linker.
+ bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
+ @echo Linking bigballofmud shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
+- $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) \
++ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
+ ln -snf libbigballofmud.so bin/libbigballofmud.so.0
+
+@@ -1090,8 +1090,8 @@
+
+ bin/[EMAIL PROTECTED]@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo "Linking $@"
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) \
+- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -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.
+@@ -1274,12 +1274,12 @@
+ @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(NTLM_AUTH_OBJ) \
+- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
+- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
++ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_PICOOBJ)
+ @echo "Linking shared library $@"
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP)
$(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) -lc
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS)
+
+ bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
+ @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ)
Index: source/lib/sysquotas_4A.c
---- source/lib/sysquotas_4A.c.orig 2005-08-19 17:16:27.000000000 +0000
-+++ source/lib/sysquotas_4A.c 2005-09-29 21:45:33.000000000 +0000
-@@ -66,6 +66,10 @@
+--- source/lib/sysquotas_4A.c.orig 2005-10-12 19:03:31 +0200
++++ source/lib/sysquotas_4A.c 2005-11-26 16:00:22 +0100
+@@ -72,6 +72,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ -26,3 +240,15 @@
#ifdef INITQFNAMES
#define USERQUOTAFILE_EXTENSION ".user"
#else
+Index: source/nsswitch/winbindd_util.c
+--- source/nsswitch/winbindd_util.c.orig 2005-10-12 19:03:28 +0200
++++ source/nsswitch/winbindd_util.c 2005-11-26 16:00:22 +0100
+@@ -900,7 +900,7 @@
+ {
+ if (_winbindd_priv_socket == -1) {
+ _winbindd_priv_socket = create_pipe_sock(
+- get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0750);
++ get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0755);
+ DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n",
+ _winbindd_priv_socket));
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.93 -r1.94 samba.spec
--- openpkg-src/samba/samba.spec 13 Oct 2005 18:24:15 -0000 1.93
+++ openpkg-src/samba/samba.spec 26 Nov 2005 16:09:49 -0000 1.94
@@ -33,13 +33,20 @@
Group: Filesystem
License: GPL
Version: 3.0.20b
-Release: 20051013
+Release: 20051126
# package options
-%option with_pam no
-%option with_swat no
-%option with_acl no
-%option with_ldap no
+%option with_pam no
+%option with_swat no
+%option with_acl no
+%option with_ldap no
+%option with_ads no
+
+# option sanity
+%if "%{with_ads}" == "yes"
+%undefine with_ldap
+%define with_ldap yes
+%endif
# list of sources
Source0: ftp://ftp.samba.org/pub/samba/samba-%{version}.tar.gz
@@ -63,6 +70,10 @@
BuildPreReq: openldap
PreReq: openldap
%endif
+%if "%{with_ads}" == "yes"
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
AutoReq: no
AutoReqProv: no
@@ -88,7 +99,7 @@
%setup -q
%patch -p0
%{l_shtool} subst \
- -e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/\.winbindd;' \
+ -e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
source/nsswitch/winbindd_nss.h
%build
@@ -97,10 +108,14 @@
CFLAGS="%{l_cflags -O}"
CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT"
LDFLAGS="%{l_ldflags}"
+ LIBS=""
%if "%{with_pam}" == "yes"
CPPFLAGS="$CPPFLAGS -I`%{l_rc} --query pam_incdir`"
LDFLAGS="$LDFLAGS -L`%{l_rc} --query pam_libdir`"
%endif
+%if "%{with_ldap}" == "yes"
+ LIBS="$LIBS -lssl -lcrypto"
+%endif
options=""
case "%{l_platform -t}" in
*-linux2.[46]* ) options="--with-smbmount" ;;
@@ -109,7 +124,9 @@
export CFLAGS
export CPPFLAGS
export LDFLAGS
+ export LIBS
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/samba \
--localstatedir=%{l_prefix}/var/samba/run \
@@ -138,6 +155,12 @@
%else
--without-ldap \
%endif
+%if "%{with_ads}" == "yes"
+ --with-ads \
+ --with-krb5=%{l_prefix} \
+%else
+ --without-ads \
+%endif
--with-vfs \
--disable-pie \
$options
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
