kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Factor out common parts of samba and winbind into net/samba/Makefile.common

Browse source 
and merge their patch collections.  These two packages are built from the
same source tree, and updates to the main distfile should be shared by
both packages.
This commit is contained in:
jlam 2002-07-30 23:05:12 +00:00
parent 84108f34ab
commit 93a2e0b916
10 changed files with 84 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
net/samba/Makefile
View file

@ -1,66 +1,24 @@
# $NetBSD: Makefile,v 1.84 2002/06/22 21:31:29 jlam Exp $
# $NetBSD: Makefile,v 1.85 2002/07/30 23:05:12 jlam Exp $
DISTNAME= samba-2.2.5
WRKSRC= ${WRKDIR}/${DISTNAME}/source
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
ftp://samba.anu.edu.au/pub/samba/ \
http://de.samba.org/samba/ftp/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/
COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
.for COUNTRY in ${COUNTRY_MIRRORS}
MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
.endfor
EXTRACT_SUFX= .tar.bz2
USE_BUILDLINK_ONLY= # defined
.include "Makefile.common"
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_BUILDLINK_ONLY= # defined
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFSUBDIR?= samba
VARDIR?= /var
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_DATADIR= ${PREFIX}/share
SAMBA_LOCKDIR?= ${VARDIR}/db/samba
SAMBA_LOGDIR?= ${VARDIR}/log
SAMBA_PIDDIR?= ${VARDIR}/run
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
CONFIGURE_ARGS+= --localstatedir=${VARDIR}
CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages
CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR}
CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat
CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ARGS+= --with-sslinc=${BUILDLINK_DIR}
CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h
CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
.include "../../print/cups/buildlink.mk"
BUILD_DEFS+= USE_CUPS
CONFIGURE_ARGS+= --enable-cups
.else
CONFIGURE_ARGS+= --disable-cups
.endif
.if defined(USE_PAM)
@ -81,21 +39,6 @@ SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \
${ROOT_USER} ${ROOT_GROUP} 0600
.endif
# The following are Linux-only options.
CONFIGURE_ARGS+= --without-smbwrapper
CONFIGURE_ARGS+= --without-smbmount
# Explicitly disable winbind until it may be properly handled by pkgsrc.
CONFIGURE_ARGS+= --without-winbind
DOCDIR= ${PREFIX}/share/doc/samba
HTMLDIR= ${PREFIX}/share/doc/html/samba
EXAMPLESDIR= ${PREFIX}/share/examples/samba
FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE}
FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}
MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP}
MESSAGE_SUBST+= ROOT_USER=${ROOT_USER}

64
net/samba/Makefile.common Normal file
View file

@ -0,0 +1,64 @@
# $NetBSD: Makefile.common,v 1.1 2002/07/30 23:05:12 jlam Exp $
DISTNAME= samba-${SAMBA_DIST_VERS}
SAMBA_DIST_VERS= 2.2.5
WRKSRC?= ${WRKDIR}/${DISTNAME}/source
CATEGORIES?= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
ftp://samba.anu.edu.au/pub/samba/ \
http://de.samba.org/samba/ftp/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/
COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
.for COUNTRY in ${COUNTRY_MIRRORS}
MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
.endfor
EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE?= ${.CURDIR}/../../net/samba/distinfo
PATCHDIR?= ${.CURDIR}/../../net/samba/patches
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFSUBDIR?= samba
VARDIR?= /var
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_DATADIR= ${PREFIX}/share
SAMBA_LOCKDIR?= ${VARDIR}/db/samba
SAMBA_LOGDIR?= ${VARDIR}/log
SAMBA_PIDDIR?= ${VARDIR}/run
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
CONFIGURE_ARGS+= --localstatedir=${VARDIR}
CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages
CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR}
CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat
CONFIGURE_ARGS+= --without-readline
CONFIGURE_ARGS+= --without-ssl
CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
CONFIGURE_ARGS+= --disable-cups
CONFIGURE_ARGS+= --without-pam
CONFIGURE_ARGS+= --without-winbind
# The following are Linux-only options.
CONFIGURE_ARGS+= --without-smbwrapper
CONFIGURE_ARGS+= --without-smbmount
FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE}
FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}

5
net/samba/distinfo
View file

@ -1,8 +1,11 @@
$NetBSD: distinfo,v 1.19 2002/06/22 21:31:30 jlam Exp $
$NetBSD: distinfo,v 1.20 2002/07/30 23:05:12 jlam Exp $
SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
Size (samba-2.2.5.tar.bz2) = 4343641 bytes
SHA1 (patch-aa) = 994befda25575f26829ea096d609dd204511d117
SHA1 (patch-ab) = 777bd40add3c40b299e03fe9b26704ebffb528d4
SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
SHA1 (patch-ad) = 38dc1cf2d2c322db32a1a3cbebf9dff59841fa4f
SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb

2
security/winbind/patches/patch-ab → net/samba/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
$NetBSD: patch-aa,v 1.20 2002/07/30 23:05:13 jlam Exp $
--- configure.in.orig Sun Jul 28 18:13:04 2002
+++ configure.in

11
security/winbind/patches/patch-ac → net/samba/patches/patch-ab
View file

@ -1,16 +1,7 @@
$NetBSD: patch-ac,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
$NetBSD: patch-ab,v 1.16 2002/07/30 23:05:13 jlam Exp $
--- configure.orig Sun Jul 28 18:13:04 2002
+++ configure
@@ -1106,7 +1106,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11945,6 +11945,49 @@ else
fi

2
security/winbind/patches/patch-aa → net/samba/patches/patch-ad
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
$NetBSD: patch-ad,v 1.9 2002/07/30 23:05:13 jlam Exp $
--- Makefile.in.orig Sun Jul 28 18:13:04 2002
+++ Makefile.in

53
security/winbind/Makefile
View file

@ -1,18 +1,11 @@
# $NetBSD: Makefile,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
# $NetBSD: Makefile,v 1.2 2002/07/30 23:05:14 jlam Exp $
DISTNAME= samba-2.2.5
PKGNAME= winbind-2.2.5
PKGNAME= winbind-${SAMBA_DIST_VERS}
CATEGORIES= security
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/ \
ftp://samba.anu.edu.au/pub/samba/ \
http://de.samba.org/samba/ftp/ \
ftp://ftp.sunet.se/pub/unix/utilities/samba/
COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
.for COUNTRY in ${COUNTRY_MIRRORS}
MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
.endfor
EXTRACT_SUFX= .tar.bz2
USE_BUILDLINK_ONLY= # defined
.include "../../net/samba/Makefile.common"
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.samba.org/
@ -20,45 +13,13 @@ COMMENT= unified logon information between UNIX and Windows NT
DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
USE_BUILDLINK_ONLY= # defined
WRKSRC= ${WRKDIR}/${DISTNAME}/source
USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
PKG_SYSCONFSUBDIR?= samba
VARDIR?= /var
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_DATADIR= ${PREFIX}/share
SAMBA_LOCKDIR?= ${VARDIR}/db/samba
SAMBA_LOGDIR?= ${VARDIR}/log
SAMBA_PIDDIR?= ${VARDIR}/run
SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --localstatedir=${VARDIR}
CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages
CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR}
CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat
CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ARGS+= --with-sslinc=${BUILDLINK_DIR}
CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h
CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
CONFIGURE_ARGS+= --with-pam
CONFIGURE_ARGS+= --with-winbind
FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}
ALL_TARGET= nsswitch
PAMDIR= ${PREFIX}/lib/security
@ -83,5 +44,7 @@ post-install:
done
.include "../../security/PAM/buildlink.mk"
.include "../../security/openssl/buildlink.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"

9
security/winbind/distinfo
View file

@ -1,9 +0,0 @@
$NetBSD: distinfo,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
Size (samba-2.2.5.tar.bz2) = 4343641 bytes
SHA1 (patch-aa) = 38dc1cf2d2c322db32a1a3cbebf9dff59841fa4f
SHA1 (patch-ab) = 994befda25575f26829ea096d609dd204511d117
SHA1 (patch-ac) = 3e371d34ce859ff6b9e65ba93e5d6f1248d3a1b5
SHA1 (patch-ad) = beb6775da56e45d5f85760ef0ef2e3f40751bb59
SHA1 (patch-ae) = fa9ddbf5988a44006c6108476c0a68e6b49b93ad

17
security/winbind/patches/patch-ad
View file

@ -1,17 +0,0 @@
$NetBSD: patch-ad,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
--- include/local.h.orig Sat Feb 2 19:46:39 2002
+++ include/local.h
@@ -170,10 +170,10 @@
* Default passwd chat script.
*/
-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
/* Minimum length of allowed password when changing UNIX password. */
-#define MINPASSWDLENGTH 5
+#define MINPASSWDLENGTH 6
/* maximum ID number used for session control. This cannot be larger
than 62*62 for the current code */

13
security/winbind/patches/patch-ae
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ae,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
--- profile/profile.c.orig Sat Feb 2 19:46:49 2002
+++ profile/profile.c
@@ -22,7 +22,7 @@
#include "includes.h"
-#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
+#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
static int shm_id;
static BOOL read_only;