1 |
dev-zero 07/09/07 21:07:40 |
2 |
|
3 |
Modified: samba-init |
4 |
Added: 3.0.x-libdirsymlink.patch digest-samba-3.0.25c |
5 |
3.0.25c-py_smp.patch 3.0.25c-lazyldflags.patch |
6 |
samba-xinetd |
7 |
Log: |
8 |
Version bump (bug #178639, thanks to Johan Andersson for the py_smb-patch). Added ipv6 support (bug #187905). Replaced 'kerberos' with 'ads' USE flag (bug #181558). Added possibility to start daemons seperately (bug #112188). Fixed python-handling (bug #177545). |
9 |
(Portage version: 2.1.3.7) |
10 |
|
11 |
Revision Changes Path |
12 |
1.15 net-fs/samba/files/samba-init |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?rev=1.15&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?rev=1.15&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-init?r1=1.14&r2=1.15 |
17 |
|
18 |
Index: samba-init |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v |
21 |
retrieving revision 1.14 |
22 |
retrieving revision 1.15 |
23 |
diff -u -r1.14 -r1.15 |
24 |
--- samba-init 9 Apr 2007 09:40:15 -0000 1.14 |
25 |
+++ samba-init 7 Sep 2007 21:07:39 -0000 1.15 |
26 |
@@ -1,7 +1,7 @@ |
27 |
#!/sbin/runscript |
28 |
# Copyright 1999-2007 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License, v2 or later |
30 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.14 2007/04/09 09:40:15 dev-zero Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.15 2007/09/07 21:07:39 dev-zero Exp $ |
32 |
|
33 |
opts="reload" |
34 |
|
35 |
@@ -11,6 +11,11 @@ |
36 |
use cupsd |
37 |
} |
38 |
|
39 |
+DAEMONNAME="${SVCNAME##samba.}" |
40 |
+if [[ -n ${DAEMONNAME} ]] ; then |
41 |
+ daemon_list=${DAEMONNAME} |
42 |
+fi |
43 |
+ |
44 |
signal_do() { |
45 |
local signal="$1" |
46 |
[ -z "${signal}" ] && return 0 |
47 |
|
48 |
|
49 |
|
50 |
1.1 net-fs/samba/files/3.0.x-libdirsymlink.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.x-libdirsymlink.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.x-libdirsymlink.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: 3.0.x-libdirsymlink.patch |
56 |
=================================================================== |
57 |
--- source/configure.in.old 2005-08-19 19:16:29.000000000 +0200 |
58 |
+++ source/configure.in 2005-08-31 16:19:41.000000000 +0200 |
59 |
@@ -1911,8 +1911,8 @@ |
60 |
dnl library directory is there and check the ABI directory first (which |
61 |
dnl should be harmless on other systems. |
62 |
dnl For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib. |
63 |
- for l in "lib32" "lib" "lib/hpux32"; do |
64 |
- if test -d "$i/$l" ; then |
65 |
+ for l in "lib" "lib/hpux32"; do |
66 |
+ if test -d "$i/$l" -o -L "$i/$l"; then |
67 |
LDFLAGS="$save_LDFLAGS -L$i/$l" |
68 |
LIBS= |
69 |
export LDFLAGS LIBS CPPFLAGS |
70 |
|
71 |
|
72 |
|
73 |
1.1 net-fs/samba/files/digest-samba-3.0.25c |
74 |
|
75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/digest-samba-3.0.25c?rev=1.1&view=markup |
76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/digest-samba-3.0.25c?rev=1.1&content-type=text/plain |
77 |
|
78 |
Index: digest-samba-3.0.25c |
79 |
=================================================================== |
80 |
MD5 87950694270b86cbc1b2074cb53dd1aa samba-3.0.25c.tar.gz 18178029 |
81 |
RMD160 7c8de2c27144b2b23e7c3f4a8fceb35bddfd571b samba-3.0.25c.tar.gz 18178029 |
82 |
SHA256 113144b8a035b1be289eaed3a12a3e8138e47f21fd79c9cc7bbf4f7eabc2870c samba-3.0.25c.tar.gz 18178029 |
83 |
|
84 |
|
85 |
|
86 |
1.1 net-fs/samba/files/3.0.25c-py_smp.patch |
87 |
|
88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-py_smp.patch?rev=1.1&view=markup |
89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-py_smp.patch?rev=1.1&content-type=text/plain |
90 |
|
91 |
Index: 3.0.25c-py_smp.patch |
92 |
=================================================================== |
93 |
diff -ruN samba-3.0.25c.orig/source/python/py_smb.c samba-3.0.25c/source/python/py_smb.c |
94 |
--- samba-3.0.25c.orig/source/python/py_smb.c 2007-03-01 05:53:57.000000000 +0100 |
95 |
+++ samba-3.0.25c/source/python/py_smb.c 2007-08-26 13:32:11.000000000 +0200 |
96 |
@@ -39,6 +39,7 @@ |
97 |
struct cli_state *cli; |
98 |
char *server; |
99 |
struct in_addr ip; |
100 |
+ NTSTATUS status; |
101 |
|
102 |
if (!PyArg_ParseTupleAndKeywords(args, kw, "s", kwlist, &server)) |
103 |
return NULL; |
104 |
@@ -48,7 +49,8 @@ |
105 |
|
106 |
ZERO_STRUCT(ip); |
107 |
|
108 |
- if (!cli_connect(cli, server, &ip)) |
109 |
+ status = cli_connect(cli, server, &ip); |
110 |
+ if (!NT_STATUS_IS_OK(status)) |
111 |
return NULL; |
112 |
|
113 |
return new_cli_state_object(cli); |
114 |
@@ -59,7 +61,7 @@ |
115 |
{ |
116 |
cli_state_object *cli = (cli_state_object *)self; |
117 |
static char *kwlist[] = { "called", "calling", NULL }; |
118 |
- char *calling_name = NULL, *called_name; |
119 |
+ const char *calling_name = NULL, *called_name; |
120 |
struct nmb_name calling, called; |
121 |
BOOL result; |
122 |
|
123 |
|
124 |
|
125 |
|
126 |
1.1 net-fs/samba/files/3.0.25c-lazyldflags.patch |
127 |
|
128 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-lazyldflags.patch?rev=1.1&view=markup |
129 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/3.0.25c-lazyldflags.patch?rev=1.1&content-type=text/plain |
130 |
|
131 |
Index: 3.0.25c-lazyldflags.patch |
132 |
=================================================================== |
133 |
diff -Naur samba-3.0.25c.orig/source/Makefile.in samba-3.0.25c/source/Makefile.in |
134 |
--- samba-3.0.25c.orig/source/Makefile.in 2007-09-01 09:14:54.000000000 +0200 |
135 |
+++ samba-3.0.25c/source/Makefile.in 2007-09-01 09:17:08.000000000 +0200 |
136 |
@@ -87,6 +87,8 @@ |
137 |
# The permissions to give the executables |
138 |
INSTALLPERMS = 0755 |
139 |
|
140 |
+LAZYLDFLAGS=-Wl,-z,now |
141 |
+ |
142 |
# set these to where to find various files |
143 |
# These can be overridden by command line switches (see smbd(8)) |
144 |
# or in smb.conf (see smb.conf(5)) |
145 |
@@ -1008,19 +1010,19 @@ |
146 |
|
147 |
bin/smbmnt@EXEEXT@: proto_exists $(MNT_OBJ) bin/.dummy |
148 |
@echo Linking $@ |
149 |
- @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) |
150 |
+ @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) |
151 |
|
152 |
bin/smbumount@EXEEXT@: proto_exists $(UMOUNT_OBJ) bin/.dummy |
153 |
@echo Linking $@ |
154 |
- @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) |
155 |
+ @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) |
156 |
|
157 |
bin/mount.cifs@EXEEXT@: $(CIFS_MOUNT_OBJ) bin/.dummy |
158 |
@echo Linking $@ |
159 |
- @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) |
160 |
+ @$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) |
161 |
|
162 |
bin/umount.cifs@EXEEXT@: $(CIFS_UMOUNT_OBJ) bin/.dummy |
163 |
@echo Linking $@ |
164 |
- @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) |
165 |
+ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LAZYLDFLAGS) |
166 |
|
167 |
bin/testparm@EXEEXT@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy |
168 |
@echo Linking $@ |
169 |
|
170 |
|
171 |
|
172 |
1.1 net-fs/samba/files/samba-xinetd |
173 |
|
174 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-xinetd?rev=1.1&view=markup |
175 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/files/samba-xinetd?rev=1.1&content-type=text/plain |
176 |
|
177 |
Index: samba-xinetd |
178 |
=================================================================== |
179 |
# Samba smb service with ipv6 support (for samba3) |
180 |
# Remember to stop samba service starting smbd before you activate this. |
181 |
service microsoft-ds |
182 |
{ |
183 |
flags = REUSE IPV6 |
184 |
socket_type = stream |
185 |
wait = no |
186 |
user = root |
187 |
server = /usr/sbin/smbd |
188 |
log_on_failure += USERID |
189 |
disable = yes |
190 |
} |
191 |
|
192 |
|
193 |
|
194 |
-- |
195 |
gentoo-commits@g.o mailing list |