diff options
author | jlam <jlam> | 2002-07-30 23:05:12 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-07-30 23:05:12 +0000 |
commit | 882c32d441060313cd922d6b59196da22c93e14e (patch) | |
tree | d7c89968acd009302245c1291881d30a320ea02b /net | |
parent | 6eadbf92d44e83de9e859d8dbf3ae1d712b6f955 (diff) | |
download | pkgsrc-882c32d441060313cd922d6b59196da22c93e14e.tar.gz |
Factor out common parts of samba and winbind into net/samba/Makefile.common
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.
Diffstat (limited to 'net')
-rw-r--r-- | net/samba/Makefile | 69 | ||||
-rw-r--r-- | net/samba/Makefile.common | 64 | ||||
-rw-r--r-- | net/samba/distinfo | 5 | ||||
-rw-r--r-- | net/samba/patches/patch-aa | 15 | ||||
-rw-r--r-- | net/samba/patches/patch-ab | 62 | ||||
-rw-r--r-- | net/samba/patches/patch-ad | 31 |
6 files changed, 182 insertions, 64 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index f6081be508c..719b22b65aa 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,66 +1,24 @@ -# $NetBSD: Makefile,v 1.84 2002/06/22 21:31:29 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 +# $NetBSD: Makefile,v 1.85 2002/07/30 23:05:12 jlam Exp $ + +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} diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common new file mode 100644 index 00000000000..48e749e5fa4 --- /dev/null +++ b/net/samba/Makefile.common @@ -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} diff --git a/net/samba/distinfo b/net/samba/distinfo index 26a35a82c02..1670587bd88 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -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 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa new file mode 100644 index 00000000000..993ff06145a --- /dev/null +++ b/net/samba/patches/patch-aa @@ -0,0 +1,15 @@ +$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 +@@ -1976,6 +1976,10 @@ AC_ARG_WITH(pam, + # we can't build a pam module if we don't have pam. + AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)]) + ++dnl Checks for libraries. ++AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc) ++AC_SUBST(PAM_NEEDS_LIBC) ++ + ################################################# + # check for pam_smbpass support + AC_MSG_CHECKING(whether to use pam_smbpass) diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab new file mode 100644 index 00000000000..6a7184a46f6 --- /dev/null +++ b/net/samba/patches/patch-ab @@ -0,0 +1,62 @@ +$NetBSD: patch-ab,v 1.16 2002/07/30 23:05:13 jlam Exp $ + +--- configure.orig Sun Jul 28 18:13:04 2002 ++++ configure +@@ -11945,6 +11945,49 @@ else + fi + + ++echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6 ++echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5 ++ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lc $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 11958 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char __libc_sched_setscheduler(); ++ ++int main() { ++__libc_sched_setscheduler() ++; return 0; } ++EOF ++if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ PAM_NEEDS_LIBC= ++else ++ echo "$ac_t""no" 1>&6 ++PAM_NEEDS_LIBC=-lc ++fi ++ ++ ++ + ################################################# + # check for pam_smbpass support + echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6 +@@ -13787,6 +13830,7 @@ s%@TERMLIBS@%$TERMLIBS%g + s%@TERMLDFLAGS@%$TERMLDFLAGS%g + s%@ROFF@%$ROFF%g + s%@DYNEXP@%$DYNEXP%g ++s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g + s%@LDAPLIBS@%$LDAPLIBS%g + s%@QUOTAOBJS@%$QUOTAOBJS%g + s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad new file mode 100644 index 00000000000..3ad1f393963 --- /dev/null +++ b/net/samba/patches/patch-ad @@ -0,0 +1,31 @@ +$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 +@@ -89,6 +89,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $ + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) + FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) + ++PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@ ++ + WINBIND_PROGS = @WINBIND_TARGETS@ + WINBIND_SPROGS = @WINBIND_STARGETS@ + WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ +@@ -650,7 +652,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB + + bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy + @echo Linking shared library $@ +- $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc \ ++ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(PAM_NEEDS_LIBC) \ + @SONAMEFLAG@`basename $@` + + nsswitch/libnss_wins.so: $(NSS_OBJ) +@@ -674,7 +676,7 @@ nsswitch/libnss_winbind.so: $(WINBIND_NS + + nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) + @echo Linking $@ +- @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \ ++ @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \ + @SONAMEFLAG@`basename $@` + + bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ |