cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't use hardcoded paths in swat man page

Browse Source 
- regen patches while here

"if it works for you" mbalmer@
This commit is contained in:
ajacoutot 2007-04-06 14:20:35 +00:00
parent 2a1eeb637f
commit 84abc278d0
8 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/samba/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.80 2007/03/29 22:12:06 deanna Exp $
# $OpenBSD: Makefile,v 1.81 2007/04/06 14:20:35 ajacoutot Exp $
COMMENT-main= "SMB and CIFS client and server for UNIX"
COMMENT-docs= "documentation and examples for samba"
DISTNAME= samba-3.0.24
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 0.3 \
msrpc 0.2
@ -101,6 +101,11 @@ SAMBA_DOCS=${WRKSRC}/../README \
SAMPLE_CONFIG= ${PREFIX}/share/examples/samba/smb.conf.default
pre-configure:
@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
-e 's,!!LOCALBASE!!,${LOCALBASE},g' \
${WRKSRC}/../docs/manpages/swat.8
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/pdf
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/htmldocs

12
net/samba/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.6 2006/10/03 14:07:10 mbalmer Exp $
--- Makefile.in.orig Mon Jul 10 18:27:55 2006
+++ Makefile.in Mon Oct 2 18:42:56 2006
$OpenBSD: patch-Makefile_in,v 1.7 2007/04/06 14:20:35 ajacoutot Exp $
--- Makefile.in.orig Sun Feb 4 19:59:28 2007
+++ Makefile.in Fri Apr 6 14:47:46 2007
@@ -103,11 +103,13 @@ LOCKDIR = @lockdir@
# the directory where pid files go
PIDDIR = @piddir@
@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2006/10/03 14:07:10 mbalmer Exp $
LIBMSRPC_MAJOR=0
LIBMSRPC_MINOR=1
@@ -1085,11 +1087,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
@@ -1099,11 +1101,10 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
$(KRB5LIBS) $(LDAP_LIBS) \
@SONAMEFLAG@`basename $@`
@ -31,7 +31,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2006/10/03 14:07:10 mbalmer Exp $
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient non-shared library $@
@@ -1105,10 +1106,9 @@ bin/libsmbsharemodes.a: $(LIBSMBSHAREMOD
@@ -1119,10 +1120,9 @@ bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes non-shared library $@
@-$(AR) -rc $@ $(LIBSMBSHAREMODES_PICOBJS)
@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2006/10/03 14:07:10 mbalmer Exp $
bin/libmsrpc.a: $(CAC_PICOBJS)
@echo Linking libmsrpc non-shared library $@
@@ -1464,14 +1464,14 @@ installswat: installdirs installmsg
@@ -1478,14 +1478,14 @@ installswat: installdirs installmsg
installclientlib: installdirs libsmbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(LIBDIR)

8
net/samba/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.10 2006/10/03 14:07:10 mbalmer Exp $
--- configure.in.orig Fri Jul 21 18:22:57 2006
+++ configure.in Mon Oct 2 18:38:41 2006
@@ -1710,6 +1710,7 @@ if test "$enable_shared" = "yes"; then
$OpenBSD: patch-configure_in,v 1.11 2007/04/06 14:20:35 ajacoutot Exp $
--- configure.in.orig Sun Feb 4 19:59:28 2007
+++ configure.in Fri Apr 6 14:47:46 2007
@@ -1706,6 +1706,7 @@ if test "$enable_shared" = "yes"; then
DYNEXP="-Wl,-Bdynamic"
SONAMEFLAG="-Wl,-soname,"
PICFLAGS="-fPIC"

4
net/samba/patches/patch-docs_manpages_swat_8
View File

@ -32,7 +32,7 @@
you should add a line like this:
.PP
-\fBswat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat\fR
+\fBswat stream tcp nowait.400 root /usr/local/libexec/swat swat\fR
+\fBswat stream tcp nowait.400 root !!LOCALBASE!!/libexec/swat swat\fR
.PP
Once you have edited
\fI/etc/services\fR
@ -41,7 +41,7 @@
This file must contain a mapping of service name (e.g., swat) to service port (e.g., 901) and protocol type (e.g., tcp).
.TP 3n
-\fI/usr/local/samba/lib/smb.conf\fR
+\fI/etc/samba/smb.conf\fR
+\fI!!SYSCONFDIR!!/samba/smb.conf\fR
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file that swat edits. Other common places that systems install this file are

6
net/samba/patches/patch-lib_smbrun_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_smbrun_c,v 1.3 2006/10/03 14:07:10 mbalmer Exp $
$OpenBSD: patch-lib_smbrun_c,v 1.4 2007/04/06 14:20:35 ajacoutot Exp $
--- lib/smbrun.c.orig Thu Apr 20 04:29:23 2006
+++ lib/smbrun.c Mon Oct 2 18:38:41 2006
+++ lib/smbrun.c Fri Apr 6 14:46:58 2007
@@ -173,7 +173,7 @@ int smbrun(const char *cmd, int *outfd)
}
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_smbrun_c,v 1.3 2006/10/03 14:07:10 mbalmer Exp $
/* not reached */
exit(82);
@@ -301,7 +301,7 @@ int smbrunsecret(const char *cmd, const
@@ -301,7 +301,7 @@ int smbrunsecret(const char *cmd, const char *secret)
}
#endif

8
net/samba/patches/patch-smbd_chgpasswd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-smbd_chgpasswd_c,v 1.2 2006/02/02 09:40:43 mbalmer Exp $
--- smbd/chgpasswd.c.orig Wed Jan 25 00:46:32 2006
+++ smbd/chgpasswd.c Tue Jan 31 10:01:07 2006
@@ -222,7 +222,7 @@ static int dochild(int master, const cha
$OpenBSD: patch-smbd_chgpasswd_c,v 1.3 2007/04/06 14:20:35 ajacoutot Exp $
--- smbd/chgpasswd.c.orig Sun Feb 4 19:59:13 2007
+++ smbd/chgpasswd.c Fri Apr 6 14:46:58 2007
@@ -222,7 +222,7 @@ static int dochild(int master, const char *slavedev, c
passwordprogram));
/* execl() password-change application */

8
net/samba/patches/patch-smbd_utmp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-smbd_utmp_c,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
$OpenBSD: patch-smbd_utmp_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
--- smbd/utmp.c.orig Fri Feb 25 18:59:26 2005
+++ smbd/utmp.c Wed Jun 15 19:36:32 2005
@@ -245,6 +245,7 @@ static void uw_pathname(pstring fname, c
+++ smbd/utmp.c Fri Apr 6 14:46:58 2007
@@ -245,6 +245,7 @@ static void uw_pathname(pstring fname, const char *uw_
}
#ifndef HAVE_PUTUTLINE
@ -9,7 +9,7 @@ $OpenBSD: patch-smbd_utmp_c,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
/****************************************************************************
Update utmp file directly. No subroutine interface: probably a BSD system.
@@ -252,8 +253,50 @@ static void uw_pathname(pstring fname, c
@@ -252,8 +253,50 @@ static void uw_pathname(pstring fname, const char *uw_
static void pututline_my(pstring uname, struct utmp *u, BOOL claim)
{

8
net/samba/patches/patch-web_swat_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-web_swat_c,v 1.4 2006/02/02 09:40:43 mbalmer Exp $
--- web/swat.c.orig Thu Sep 29 23:52:45 2005
+++ web/swat.c Tue Oct 4 09:16:29 2005
@@ -136,8 +136,10 @@ static int include_html(const char *fnam
$OpenBSD: patch-web_swat_c,v 1.5 2007/04/06 14:20:35 ajacoutot Exp $
--- web/swat.c.orig Sun Feb 4 19:59:21 2007
+++ web/swat.c Fri Apr 6 14:46:58 2007
@@ -136,8 +136,10 @@ static int include_html(const char *fname)
fd = web_open(fname, O_RDONLY, 0);
if (fd == -1) {