mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

Update to Alpha18

Browse Source
This commit is contained in:
David W. Chapman Jr. 2002-08-09 14:43:34 +00:00
parent 5bc7cd1ff5
commit 552d116623
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=64279
14 changed files with 32 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/samba-devel/Makefile
View File

@ -6,13 +6,9 @@
#
PORTNAME= samba
PORTVERSION= 3.0a17
PORTVERSION= 3.0a18
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
ftp://se.samba.org/pub/samba/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/
MASTER_SITE_SUBDIR= alpha old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/-alpha/}
@ -46,7 +42,8 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
--with-sambabook=${PREFIX}/share/swat/using_samba \
--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
--exec-prefix=${PREFIX} --with-pam --without-manpages-langs
--exec-prefix=${PREFIX} --with-pam --without-manpages-langs \
--with-piddir=${VARDIR}/run
.include <bsd.port.pre.mk>

2
net/samba-devel/distinfo
View File

@ -1 +1 @@
MD5 (samba-3.0-alpha17.tar.gz) = b51da442b660fa27d83d290576a93a17
MD5 (samba-3.0-alpha18.tar.gz) = 64adf29c7a05b46b7092a9630eb4a66b

29
net/samba-devel/files/patch-aa
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Dec 13 21:38:49 2001
+++ Makefile.in Sun Dec 16 13:09:45 2001
@@ -50,7 +50,7 @@
--- Makefile.in.orig Fri Aug 9 08:34:27 2002
+++ Makefile.in Fri Aug 9 08:36:52 2002
@@ -52,7 +52,7 @@
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
@ -9,26 +9,7 @@
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
@@ -66,6 +66,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@
+# the directory where pid files go
+PIDFILEDIR = $(VARDIR)/run
+
# man pages language(s)
man_langs = "@manlangs@"
@@ -78,7 +81,7 @@
FLAGS32 = $(ISA32) $(FLAGS5)
PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
-PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\"
+PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\"
PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\"
PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\"
@@ -503,7 +506,7 @@
@@ -557,7 +557,7 @@
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo Compiling $*.c
@ -37,7 +18,7 @@
-o $@
@BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
@@ -529,7 +532,7 @@
@@ -583,7 +583,7 @@
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo Compiling $*.c with @PICFLAG@

35
net/samba-devel/files/patch-ab
View File

@ -1,35 +0,0 @@
--- param/loadparm.c.orig Thu Dec 13 21:38:57 2001
+++ param/loadparm.c Sun Dec 16 01:11:34 2001
@@ -97,6 +97,7 @@
char *szDeletePrinterCommand;
char *szOs2DriverMap;
char *szLockDir;
+ char *szPidDir;
char *szRootdir;
char *szDefaultService;
char *szDfree;
@@ -975,6 +976,8 @@
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
+ {"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
#ifdef WITH_UTMP
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
@@ -1208,6 +1211,7 @@
string_set(&Globals.szPasswdProgram, "");
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
string_set(&Globals.szLockDir, dyn_LOCKDIR);
+ string_set(&Globals.szPidDir, PIDFILEDIR);
string_set(&Globals.szSocketAddress, "0.0.0.0");
pstrcpy(s, "Samba ");
pstrcat(s, VERSION);
@@ -1457,6 +1461,7 @@
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
#ifdef WITH_UTMP
FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)

20
net/samba-devel/files/patch-ac
View File

@ -1,20 +0,0 @@
--- lib/pidfile.c.orig Sat Oct 13 22:09:24 2001
+++ lib/pidfile.c Tue Oct 16 17:17:51 2001
@@ -39,7 +39,7 @@
unsigned ret;
pstring pidFile;
- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
if (fd == -1) {
@@ -80,7 +80,7 @@
pstring pidFile;
pid_t pid;
- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
pid = pidfile_pid(name);
if (pid != 0) {

11
net/samba-devel/files/patch-ba
View File

@ -1,11 +0,0 @@
--- configure.orig Sun Dec 16 01:41:44 2001
+++ configure Sun Dec 16 01:41:54 2001
@@ -16688,7 +16688,7 @@
fi
- LIBS="-lssl -lcrypto $LIBS"
+ LIBS="-lssl -lk5crypto $LIBS"
# if test ! -d ${withval}; then
# echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2

7
net/samba-devel/pkg-plist
View File

@ -39,6 +39,7 @@ sbin/swat
%%PORTDOCS%%share/doc/samba/THANKS
%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
%%PORTDOCS%%share/doc/samba/announce
%%PORTDOCS%%share/doc/samba/faq/README
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
@ -134,7 +135,7 @@ sbin/swat
%%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
%%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
%%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
%%PORTDOCS%%share/doc/samba/textdocs/Samba-OpenSSL.txt
%%PORTDOCS%%share/doc/samba/textdocs/Solaris-Winbind-HOWTO.txt
%%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
%%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
%%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
@ -154,6 +155,7 @@ share/examples/samba/VFS/block/samba-block.conf
share/examples/samba/VFS/block/smb.conf
share/examples/samba/VFS/audit.c
share/examples/samba/VFS/skel.c
share/examples/samba/VFS/recycle.c
share/examples/samba/LDAP/README
share/examples/samba/LDAP/export2_smbpasswd.pl
share/examples/samba/LDAP/export_smbpasswd.pl
@ -162,6 +164,9 @@ share/examples/samba/LDAP/import_smbpasswd.pl
share/examples/samba/LDAP/ldapchpasswd
share/examples/samba/LDAP/ldapsync.pl
share/examples/samba/LDAP/samba.schema
share/examples/samba/LDAP/samba-schema-netscapeds4.x
share/examples/samba/LDAP/samba-schema-netscapeds5.x
share/examples/samba/LDAP/samba-schema.IBMSecureWay
share/examples/samba/appliance/Makefile
share/examples/samba/appliance/README
share/examples/samba/appliance/appliance.spec

11
net/samba3/Makefile
View File

@ -6,13 +6,9 @@
#
PORTNAME= samba
PORTVERSION= 3.0a17
PORTVERSION= 3.0a18
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/%SUBDIR%/ \
ftp://samba.anu.edu.au/pub/samba/%SUBDIR%/ \
ftp://de.samba.org/pub/mirror/samba/%SUBDIR%/ \
ftp://se.samba.org/pub/samba/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/%SUBDIR%/
MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/
MASTER_SITE_SUBDIR= alpha old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/-alpha/}
@ -46,7 +42,8 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \
--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
--with-sambabook=${PREFIX}/share/swat/using_samba \
--with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \
--exec-prefix=${PREFIX} --with-pam --without-manpages-langs
--exec-prefix=${PREFIX} --with-pam --without-manpages-langs \
--with-piddir=${VARDIR}/run
.include <bsd.port.pre.mk>

2
net/samba3/distinfo
View File

@ -1 +1 @@
MD5 (samba-3.0-alpha17.tar.gz) = b51da442b660fa27d83d290576a93a17
MD5 (samba-3.0-alpha18.tar.gz) = 64adf29c7a05b46b7092a9630eb4a66b

29
net/samba3/files/patch-aa
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Dec 13 21:38:49 2001
+++ Makefile.in Sun Dec 16 13:09:45 2001
@@ -50,7 +50,7 @@
--- Makefile.in.orig Fri Aug 9 08:34:27 2002
+++ Makefile.in Fri Aug 9 08:36:52 2002
@@ -52,7 +52,7 @@
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
@ -9,26 +9,7 @@
CONFIGFILE = $(LIBDIR)/smb.conf
LMHOSTSFILE = $(LIBDIR)/lmhosts
DRIVERFILE = $(LIBDIR)/printers.def
@@ -66,6 +66,9 @@
# the directory where lock files go
LOCKDIR = @lockdir@
+# the directory where pid files go
+PIDFILEDIR = $(VARDIR)/run
+
# man pages language(s)
man_langs = "@manlangs@"
@@ -78,7 +81,7 @@
FLAGS32 = $(ISA32) $(FLAGS5)
PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
-PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\"
+PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\"
PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\"
PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\"
@@ -503,7 +506,7 @@
@@ -557,7 +557,7 @@
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo Compiling $*.c
@ -37,7 +18,7 @@
-o $@
@BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@
@@ -529,7 +532,7 @@
@@ -583,7 +583,7 @@
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo Compiling $*.c with @PICFLAG@

35
net/samba3/files/patch-ab
View File

@ -1,35 +0,0 @@
--- param/loadparm.c.orig Thu Dec 13 21:38:57 2001
+++ param/loadparm.c Sun Dec 16 01:11:34 2001
@@ -97,6 +97,7 @@
char *szDeletePrinterCommand;
char *szOs2DriverMap;
char *szLockDir;
+ char *szPidDir;
char *szRootdir;
char *szDefaultService;
char *szDfree;
@@ -975,6 +976,8 @@
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, 0},
{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
+ {"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
#ifdef WITH_UTMP
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
@@ -1208,6 +1211,7 @@
string_set(&Globals.szPasswdProgram, "");
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
string_set(&Globals.szLockDir, dyn_LOCKDIR);
+ string_set(&Globals.szPidDir, PIDFILEDIR);
string_set(&Globals.szSocketAddress, "0.0.0.0");
pstrcpy(s, "Samba ");
pstrcat(s, VERSION);
@@ -1457,6 +1461,7 @@
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
#ifdef WITH_UTMP
FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)

20
net/samba3/files/patch-ac
View File

@ -1,20 +0,0 @@
--- lib/pidfile.c.orig Sat Oct 13 22:09:24 2001
+++ lib/pidfile.c Tue Oct 16 17:17:51 2001
@@ -39,7 +39,7 @@
unsigned ret;
pstring pidFile;
- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
if (fd == -1) {
@@ -80,7 +80,7 @@
pstring pidFile;
pid_t pid;
- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
pid = pidfile_pid(name);
if (pid != 0) {

11
net/samba3/files/patch-ba
View File

@ -1,11 +0,0 @@
--- configure.orig Sun Dec 16 01:41:44 2001
+++ configure Sun Dec 16 01:41:54 2001
@@ -16688,7 +16688,7 @@
fi
- LIBS="-lssl -lcrypto $LIBS"
+ LIBS="-lssl -lk5crypto $LIBS"
# if test ! -d ${withval}; then
# echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2

7
net/samba3/pkg-plist
View File

@ -39,6 +39,7 @@ sbin/swat
%%PORTDOCS%%share/doc/samba/THANKS
%%PORTDOCS%%share/doc/samba/WHATSNEW.txt
%%PORTDOCS%%share/doc/samba/announce
%%PORTDOCS%%share/doc/samba/faq/README
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-1.html
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ-2.html
%%PORTDOCS%%share/doc/samba/faq/Samba-Server-FAQ.html
@ -134,7 +135,7 @@ sbin/swat
%%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt
%%PORTDOCS%%share/doc/samba/textdocs/SCO.txt
%%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes
%%PORTDOCS%%share/doc/samba/textdocs/Samba-OpenSSL.txt
%%PORTDOCS%%share/doc/samba/textdocs/Solaris-Winbind-HOWTO.txt
%%PORTDOCS%%share/doc/samba/textdocs/Speed.txt
%%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt
%%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt
@ -154,6 +155,7 @@ share/examples/samba/VFS/block/samba-block.conf
share/examples/samba/VFS/block/smb.conf
share/examples/samba/VFS/audit.c
share/examples/samba/VFS/skel.c
share/examples/samba/VFS/recycle.c
share/examples/samba/LDAP/README
share/examples/samba/LDAP/export2_smbpasswd.pl
share/examples/samba/LDAP/export_smbpasswd.pl
@ -162,6 +164,9 @@ share/examples/samba/LDAP/import_smbpasswd.pl
share/examples/samba/LDAP/ldapchpasswd
share/examples/samba/LDAP/ldapsync.pl
share/examples/samba/LDAP/samba.schema
share/examples/samba/LDAP/samba-schema-netscapeds4.x
share/examples/samba/LDAP/samba-schema-netscapeds5.x
share/examples/samba/LDAP/samba-schema.IBMSecureWay
share/examples/samba/appliance/Makefile
share/examples/samba/appliance/README
share/examples/samba/appliance/appliance.spec