head 1.29; access; symbols pkgsrc-2026Q1:1.29.0.98 pkgsrc-2026Q1-base:1.29 pkgsrc-2025Q4:1.29.0.96 pkgsrc-2025Q4-base:1.29 pkgsrc-2025Q3:1.29.0.94 pkgsrc-2025Q3-base:1.29 pkgsrc-2025Q2:1.29.0.92 pkgsrc-2025Q2-base:1.29 pkgsrc-2025Q1:1.29.0.90 pkgsrc-2025Q1-base:1.29 pkgsrc-2024Q4:1.29.0.88 pkgsrc-2024Q4-base:1.29 pkgsrc-2024Q3:1.29.0.86 pkgsrc-2024Q3-base:1.29 pkgsrc-2024Q2:1.29.0.84 pkgsrc-2024Q2-base:1.29 pkgsrc-2024Q1:1.29.0.82 pkgsrc-2024Q1-base:1.29 pkgsrc-2023Q4:1.29.0.80 pkgsrc-2023Q4-base:1.29 pkgsrc-2023Q3:1.29.0.78 pkgsrc-2023Q3-base:1.29 pkgsrc-2023Q2:1.29.0.76 pkgsrc-2023Q2-base:1.29 pkgsrc-2023Q1:1.29.0.74 pkgsrc-2023Q1-base:1.29 pkgsrc-2022Q4:1.29.0.72 pkgsrc-2022Q4-base:1.29 pkgsrc-2022Q3:1.29.0.70 pkgsrc-2022Q3-base:1.29 pkgsrc-2022Q2:1.29.0.68 pkgsrc-2022Q2-base:1.29 pkgsrc-2022Q1:1.29.0.66 pkgsrc-2022Q1-base:1.29 pkgsrc-2021Q4:1.29.0.64 pkgsrc-2021Q4-base:1.29 pkgsrc-2021Q3:1.29.0.62 pkgsrc-2021Q3-base:1.29 pkgsrc-2021Q2:1.29.0.60 pkgsrc-2021Q2-base:1.29 pkgsrc-2021Q1:1.29.0.58 pkgsrc-2021Q1-base:1.29 pkgsrc-2020Q4:1.29.0.56 pkgsrc-2020Q4-base:1.29 pkgsrc-2020Q3:1.29.0.54 pkgsrc-2020Q3-base:1.29 pkgsrc-2020Q2:1.29.0.50 pkgsrc-2020Q2-base:1.29 pkgsrc-2020Q1:1.29.0.30 pkgsrc-2020Q1-base:1.29 pkgsrc-2019Q4:1.29.0.52 pkgsrc-2019Q4-base:1.29 pkgsrc-2019Q3:1.29.0.48 pkgsrc-2019Q3-base:1.29 pkgsrc-2019Q2:1.29.0.46 pkgsrc-2019Q2-base:1.29 pkgsrc-2019Q1:1.29.0.44 pkgsrc-2019Q1-base:1.29 pkgsrc-2018Q4:1.29.0.42 pkgsrc-2018Q4-base:1.29 pkgsrc-2018Q3:1.29.0.40 pkgsrc-2018Q3-base:1.29 pkgsrc-2018Q2:1.29.0.38 pkgsrc-2018Q2-base:1.29 pkgsrc-2018Q1:1.29.0.36 pkgsrc-2018Q1-base:1.29 pkgsrc-2017Q4:1.29.0.34 pkgsrc-2017Q4-base:1.29 pkgsrc-2017Q3:1.29.0.32 pkgsrc-2017Q3-base:1.29 pkgsrc-2017Q2:1.29.0.28 pkgsrc-2017Q2-base:1.29 pkgsrc-2017Q1:1.29.0.26 pkgsrc-2017Q1-base:1.29 pkgsrc-2016Q4:1.29.0.24 pkgsrc-2016Q4-base:1.29 pkgsrc-2016Q3:1.29.0.22 pkgsrc-2016Q3-base:1.29 pkgsrc-2016Q2:1.29.0.20 pkgsrc-2016Q2-base:1.29 pkgsrc-2016Q1:1.29.0.18 pkgsrc-2016Q1-base:1.29 pkgsrc-2015Q4:1.29.0.16 pkgsrc-2015Q4-base:1.29 pkgsrc-2015Q3:1.29.0.14 pkgsrc-2015Q3-base:1.29 pkgsrc-2015Q2:1.29.0.12 pkgsrc-2015Q2-base:1.29 pkgsrc-2015Q1:1.29.0.10 pkgsrc-2015Q1-base:1.29 pkgsrc-2014Q4:1.29.0.8 pkgsrc-2014Q4-base:1.29 pkgsrc-2014Q3:1.29.0.6 pkgsrc-2014Q3-base:1.29 pkgsrc-2014Q2:1.29.0.4 pkgsrc-2014Q2-base:1.29 pkgsrc-2014Q1:1.29.0.2 pkgsrc-2014Q1-base:1.29 pkgsrc-2013Q4:1.28.0.18 pkgsrc-2013Q4-base:1.28 pkgsrc-2013Q3:1.28.0.16 pkgsrc-2013Q3-base:1.28 pkgsrc-2013Q2:1.28.0.14 pkgsrc-2013Q2-base:1.28 pkgsrc-2013Q1:1.28.0.12 pkgsrc-2013Q1-base:1.28 pkgsrc-2012Q4:1.28.0.10 pkgsrc-2012Q4-base:1.28 pkgsrc-2012Q3:1.28.0.8 pkgsrc-2012Q3-base:1.28 pkgsrc-2012Q2:1.28.0.6 pkgsrc-2012Q2-base:1.28 pkgsrc-2012Q1:1.28.0.4 pkgsrc-2012Q1-base:1.28 pkgsrc-2011Q4:1.28.0.2 pkgsrc-2011Q4-base:1.28 pkgsrc-2011Q2:1.27.0.14 pkgsrc-2011Q2-base:1.27 pkgsrc-2009Q4:1.27.0.12 pkgsrc-2009Q4-base:1.27 pkgsrc-2008Q4:1.27.0.10 pkgsrc-2008Q4-base:1.27 pkgsrc-2008Q3:1.27.0.8 pkgsrc-2008Q3-base:1.27 cube-native-xorg:1.27.0.6 cube-native-xorg-base:1.27 pkgsrc-2008Q2:1.27.0.4 pkgsrc-2008Q2-base:1.27 pkgsrc-2008Q1:1.27.0.2 pkgsrc-2008Q1-base:1.27 pkgsrc-2007Q4:1.26.0.8 pkgsrc-2007Q4-base:1.26 pkgsrc-2007Q3:1.26.0.6 pkgsrc-2007Q3-base:1.26 pkgsrc-2007Q2:1.26.0.4 pkgsrc-2007Q2-base:1.26 pkgsrc-2007Q1:1.26.0.2 pkgsrc-2007Q1-base:1.26 pkgsrc-2006Q4:1.25.0.2 pkgsrc-2006Q4-base:1.25 pkgsrc-2006Q3:1.24.0.8 pkgsrc-2006Q3-base:1.24 pkgsrc-2006Q2:1.24.0.6 pkgsrc-2006Q2-base:1.24 pkgsrc-2006Q1:1.24.0.4 pkgsrc-2006Q1-base:1.24 pkgsrc-2005Q4:1.24.0.2 pkgsrc-2005Q4-base:1.24 pkgsrc-2005Q3:1.23.0.10 pkgsrc-2005Q3-base:1.23 pkgsrc-2005Q2:1.23.0.8 pkgsrc-2005Q2-base:1.23 pkgsrc-2005Q1:1.23.0.6 pkgsrc-2005Q1-base:1.23 pkgsrc-2004Q4:1.23.0.4 pkgsrc-2004Q4-base:1.23 pkgsrc-2004Q3:1.23.0.2 pkgsrc-2004Q3-base:1.23 pkgsrc-2004Q2:1.22.0.4 pkgsrc-2004Q2-base:1.22 pkgsrc-2004Q1:1.22.0.2 pkgsrc-2004Q1-base:1.22 pkgsrc-2003Q4:1.20.0.2 pkgsrc-2003Q4-base:1.20 netbsd-1-6-1:1.19.0.2 netbsd-1-6-1-base:1.19 netbsd-1-6:1.16.0.4 netbsd-1-6-RELEASE-base:1.16 buildlink2:1.14.0.2 buildlink2-base:1.16 netbsd-1-5-PATCH003:1.13 netbsd-1-5-PATCH001:1.9 netbsd-1-3-PATCH003:1.5 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.29 date 2014.03.03.08.15.10; author obache; state Exp; branches; next 1.28; commitid v0NcEYrcq5z6cerx; 1.28 date 2011.12.16.11.05.24; author asau; state Exp; branches 1.28.18.1; next 1.27; 1.27 date 2008.04.03.20.19.42; author jlam; state dead; branches; next 1.26; 1.26 date 2007.02.11.18.39.04; author tron; state Exp; branches; next 1.25; 1.25 date 2006.10.17.05.46.09; author rillig; state Exp; branches 1.25.2.1; next 1.24; 1.24 date 2005.11.14.08.05.27; author jlam; state Exp; branches; next 1.23; 1.23 date 2004.09.15.08.51.44; author adam; state Exp; branches; next 1.22; 1.22 date 2004.02.17.11.51.54; author jlam; state dead; branches; next 1.21; 1.21 date 2004.01.11.02.26.31; author jlam; state Exp; branches; next 1.20; 1.20 date 2003.03.16.07.57.46; author martti; state Exp; branches; next 1.19; 1.19 date 2002.12.13.08.37.11; author martti; state Exp; branches 1.19.2.1; next 1.18; 1.18 date 2002.10.18.11.50.28; author martti; state Exp; branches; next 1.17; 1.17 date 2002.08.25.21.50.13; author jlam; state Exp; branches; next 1.16; 1.16 date 2002.07.30.23.05.13; author jlam; state Exp; branches; next 1.15; 1.15 date 2002.06.22.21.31.31; author jlam; state dead; branches; next 1.14; 1.14 date 2002.05.05.16.57.12; author taca; state Exp; branches 1.14.2.1; next 1.13; 1.13 date 2002.02.05.00.36.26; author taca; state Exp; branches; next 1.12; 1.12 date 2001.06.19.09.03.32; author jlam; state dead; branches; next 1.11; 1.11 date 2001.05.22.21.49.29; author jlam; state Exp; branches; next 1.10; 1.10 date 2001.05.14.18.56.17; author jlam; state Exp; branches; next 1.9; 1.9 date 2001.05.10.09.00.23; author abs; state Exp; branches; next 1.8; 1.8 date 2000.01.19.00.42.42; author jlam; state dead; branches; next 1.7; 1.7 date 99.11.16.21.01.05; author jlam; state Exp; branches; next 1.6; 1.6 date 99.02.18.11.50.07; author bouyer; state dead; branches; next 1.5; 1.5 date 98.09.04.19.17.19; author bad; state Exp; branches; next 1.4; 1.4 date 98.08.07.11.10.54; author agc; state Exp; branches; next 1.3; 1.3 date 98.06.17.17.07.14; author bouyer; state Exp; branches; next 1.2; 1.2 date 98.06.04.13.08.36; author agc; state Exp; branches; next 1.1; 1.1 date 98.01.12.17.31.16; author agc; state Exp; branches; next ; 1.28.18.1 date 2014.03.18.12.42.57; author tron; state Exp; branches; next ; commitid pwkyZITlGqGncbtx; 1.25.2.1 date 2007.02.15.13.14.45; author salo; state Exp; branches; next ; 1.19.2.1 date 2003.03.23.01.23.57; author jmc; state Exp; branches; next ; 1.14.2.1 date 2002.06.23.18.56.59; author jlam; state dead; branches; next 1.14.2.2; 1.14.2.2 date 2002.08.25.21.20.33; author jlam; state Exp; branches; next ; desc @@ 1.29 log @Replace log dir in the default sample config file correctly. Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $ --- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000 +++ ../examples/smb.conf.default @@@@ -26,7 +26,7 @@@@ workgroup = MYGROUP # server string is the equivalent of the NT Description field - server string = Samba Server + server string = Samba %v (%h) # Security mode. Defines in which mode Samba will operate. Possible # values are share, user, server, domain and ads. Most people will want @@@@ -63,10 +63,10 @@@@ # this tells Samba to use a separate log file for each machine # that connects - log file = /usr/local/samba/var/log.%m +; log file = @@SAMBA_LOGDIR@@/log.%m # Put a capping on the size of the log files (in Kb). - max log size = 50 +; max log size = 50 # Use password server option only with security = server # The argument list may include: @@@@ -145,7 +145,7 @@@@ # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names # via DNS nslookups. The default is NO. - dns proxy = no +; dns proxy = no # These scripts are used on a domain controller or stand-alone # machine to add or delete corresponding unix accounts @@@@ -182,14 +182,14 @@@@ # NOTE: If you have a BSD-style print system there is no need to # specifically define each individual printer -[printers] - comment = All Printers - path = /usr/spool/samba - browseable = no +;[printers] +; comment = All Printers +; path = /usr/spool/samba +; browseable = no # Set public = yes to allow user 'guest account' to print - guest ok = no - writable = no - printable = yes +; guest ok = no +; writable = no +; printable = yes # This one is useful for people to share files ;[tmp] @ 1.28 log @Update to Samba 3.5.11 from net/samba35, part of Samba packages rearrangement. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $ d19 1 a19 1 +; log file = @@VARBASE@@/log/log.%m @ 1.28.18.1 log @Pullup ticket #4348 - requested by taca net/samba: security update Revisions pulled up: - net/samba/Makefile 1.242-1.247 - net/samba/distinfo 1.97-1.98 - net/samba/patches/patch-ab 1.29 --- Module Name: pkgsrc Committed By: obache Date: Tue Jan 28 12:16:39 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile Log Message: Use GNU_CONFIGURE_LIBDIR for --libdir. --- Module Name: pkgsrc Committed By: tron Date: Wed Feb 12 23:18:57 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile Log Message: Recursive PKGREVISION bump for OpenSSL API version bump. --- Module Name: pkgsrc Committed By: obache Date: Mon Mar 3 08:05:07 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile Log Message: simplify with SUBST_VARS. --- Module Name: pkgsrc Committed By: obache Date: Mon Mar 3 08:15:10 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile distinfo pkgsrc/net/samba/patches: patch-ab Log Message: Replace log dir in the default sample config file correctly. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: jperkin Date: Thu Mar 13 11:08:54 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile Log Message: Set USE_GCC_RUNTIME=yes for packages which build shared libraries but do not use libtool to do so. This is required to correctly depend upon a gcc runtime package (e.g. gcc47-libs) when using USE_PKGSRC_GCC_RUNTIME. --- Module Name: pkgsrc Committed By: taca Date: Mon Mar 17 14:01:57 UTC 2014 Modified Files: pkgsrc/net/samba: Makefile distinfo Log Message: Update samba to 3.6.23. ============================== Release Notes for Samba 3.6.23 March 11, 2014 ============================== This is a security release in order to address CVE-2013-4496 (Password lockout not enforced for SAMR password changes). o CVE-2013-4496: Samba versions 3.4.0 and above allow the administrator to implement locking out Samba accounts after a number of bad password attempts. However, all released versions of Samba did not implement this check for password changes, such as are available over multiple SAMR and RAP interfaces, allowing password guessing attacks. @ text @d1 1 a1 1 $NetBSD$ d19 1 a19 1 +; log file = @@SAMBA_LOGDIR@@/log.%m @ 1.27 log @Update samba to version 3.0.28a. CHANGES FOR PKGSRC: ================== Makefile: + Modify section that manually handles the ELF symlinks for samba shared libraries -- add additional libraries that are built (addns, smbsharemodes) and reorganize so we don't need two loops where one will do. + Pass --with-included-popt to the configure script to force using the popt distribution included with samba to avoid any library mismatch errors between samba and any installed popt. This fixes PR pkg/34444 by Jason Lingohr. + Don't build the smbmount programs on Linux -- they're deprecated in favor of the mount.cifs programs. + Remove some pkgviews-related settings -- I'm not supporting pkgviews installation of samba. Makefile.patches: + Empty out PATCHFILES because we are updating to the latest release of samba, which has all previous patches for security advisories already rolled into the main sources. Makefile.mirrors: + Update SAMBA_MIRRORS in Makefile.mirrors to the latest list of FTP mirrors. options.mk: + Only show the ``acl'' option on platforms that actually support POSIX ACLs. + Add a new ``fam'' option to enable building the notify_fam VFS module. patch-ab, patch-ax: + Remove patch-ab and update patch-ax -- there's nothing for the scripts to back up so we don't need to patch the install* scripts to avoid this. patch-ae, patch-ah: + Update patch-ae and remove patch-ah -- we should definitely check that PAM_AUTHTOK_RECOVERY_ERR is defined before using its value to define PAM_AUTHTOK_RECOVER_ERR. patch-at, patch-au: + Fix patch-at and patch-au -- in configure.in, we need to "escape" left and right brackets or else m4 will strip them away in the resulting configure script. This should fix the detection of FreeBSD and NetBSD systems capable of using nss_winbind noted in PR pkg/38076 by Ingo Meyer. patch-ay: + Remove some unnecessary changes -- we can safely just do "mkdir" in some places because we know the parent and any intermediate directories exist. patch-be: + Fix a bug in locating WINS_LIST -- nmbd/nmbd_winsserver.c was referring to WINS_LIST under the state directory in one place and under the lock directory in another; change all references to be under the state directory. patch-db: + Add patch to fix the build of samba on older BSDs. Patch supplied in PR pkg/37487 by John Frear. All remaining changes to patches/patch-* are simply to remove fuzz. MAJOR CHANGES FROM VERSION 3.0.26a: * Fix failure to join Windows 2008 domains. * Fix Windows Vista (including SP1 RC) inter-op issues. * Add a new ``administrative share'' service parameter for defining hidden shares that cannot be managed from Windows. * Fix for CVS-2007-6015 (already fixed in 3.0.26anb4 in pkgsrc). * Fix for CVS-2007-5398 (already fixed in 3.0.26anb4 in pkgsrc). * Fix for CVS-2007-4572 (already fixed in 3.0.26anb4 in pkgsrc). Also subsequent fix for regression experienced by smbfs clients caused by the fix for CVS-2007-4572, noted in PR pkg/38300 by Dave Barnes. * Many other bugs fixed and memory leaks plugged. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.26 2007/02/11 18:39:04 tron Exp $ d3 55 a57 12 --- script/installbin.sh.in.orig 2007-02-04 18:59:25.000000000 +0000 +++ script/installbin.sh.in 2007-02-11 15:13:13.000000000 +0000 @@@@ -14,8 +14,7 @@@@ p2=`basename $p` echo "Installing $p as $DESTDIR/$BINDIR/$p2 " if [ -f $DESTDIR/$BINDIR/$p2 ]; then - rm -f $DESTDIR/$BINDIR/$p2.old - mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old + rm -f $DESTDIR/$BINDIR/$p2 fi cp $p $DESTDIR/$BINDIR/ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2 @ 1.26 log @Update "samba" package to version 3.0.24. Major changes since version 3.0.22: - CVE-2007-0452 (Potential Denial of Service bug in smbd) - CVE-2007-0453 (Buffer overrun in NSS host lookup Winbind NSS library on Solaris) - CVE-2007-0454 (Format string bug in afsacl.so VFS plugin) - Stability fixes for winbindd - Portability fixes on FreeBSD and Solaris operating systems. - Authentication failures in pam_winbind when the AD domain policy is set to not expire passwords. - Authorization failures when using smb.conf options such as "valid users" with the smbpasswd passdb backend. - Ambiguity with unqualified names in smb.conf parameters such as "force user" and "valid users". - Errors in 'net ads join' caused by bad IP address in the list of domain controllers. - SMB signing errors in the client and server code. - Domain join failures when using smbpasswd on a Samba PDC. - Failure to strip the domain name from groups when 'winbind use default domain = yes' - Failure in pam_winbind to correctly parse arguments. - Bad token creation of local users on member servers not running winbindd. - Failure to add users or groups to ACLs using the Windows object picker. - Failure in file serving code when 'kernel oplocks = yes'. - New "createupn" option to "net ads join" - Rewritten Kerberos keytab generation when 'use kerberos keytab = yes' - Improved 'make test' - New offline mode in winbindd. - New Kerberos support for pam_winbind.so. - New handling of unmapped users and groups. - New non-root share management tools. - Improved support for local and BUILTIN groups. - Winbind IDMAP integration with RFC2307 schema objects supported by Windows 2003 R2. - Rewritten 'net ads join' to mimic Windows XP without requiring administrative rights to join a domain. @ text @d1 1 a1 1 $NetBSD$ @ 1.25 log @Fixed the install stage so that it is more likely to pass the files-check: No backup copies of the Samba binaries are made. Before using ln -s, the destination file is removed. This is necessary for installing the package over an already-installed version. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.24 2005/11/14 08:05:27 jlam Exp $ d3 3 a5 3 --- script/installbin.sh.orig 2005-02-25 18:59:43.000000000 +0100 +++ script/installbin.sh 2006-10-17 07:11:30.000000000 +0200 @@@@ -17,16 +17,16 @@@@ for p in $*; do d7 5 a11 17 echo Installing $p as $BINDIR/$p2 if [ -f $BINDIR/$p2 ]; then - rm -f $BINDIR/$p2.old - mv $BINDIR/$p2 $BINDIR/$p2.old + rm -f $BINDIR/$p2 fi cp $p $BINDIR/ chmod $INSTALLPERMS $BINDIR/$p2 + strip $BINDIR/$p2 # this is a special case, mount needs this in a specific location if [ $p2 = smbmount ]; then if [ ! -d $DESTDIR/sbin ]; then - mkdir $DESTDIR/sbin + mkdir -p $DESTDIR/sbin fi ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs d13 2 @ 1.25.2.1 log @Pullup ticket 2019 - requested by tron security update for samba Revisions pulled up: - pkgsrc/net/samba/Makefile 1.169 - pkgsrc/net/samba/PLIST 1.35 - pkgsrc/net/samba/distinfo 1.52 - pkgsrc/net/samba/patches/patch-ab 1.26 - pkgsrc/net/samba/patches/patch-ad removed - pkgsrc/net/samba/patches/patch-af 1.8 - pkgsrc/net/samba/patches/patch-ag 1.6 - pkgsrc/net/samba/patches/patch-ai 1.4 - pkgsrc/net/samba/patches/patch-al 1.5 - pkgsrc/net/samba/patches/patch-at 1.6 - pkgsrc/net/samba/patches/patch-au 1.6 - pkgsrc/net/samba/patches/patch-aw 1.2 - pkgsrc/net/samba/patches/patch-ay 1.2 - pkgsrc/net/samba/patches/patch-ba 1.4 - pkgsrc/net/samba/patches/patch-bb 1.2 - pkgsrc/net/samba/patches/patch-bg 1.2 - pkgsrc/net/samba/patches/patch-bi 1.4 - pkgsrc/net/samba/patches/patch-bl removed - pkgsrc/net/samba/patches/patch-bm 1.2 - pkgsrc/net/samba/patches/patch-bn 1.2 - pkgsrc/net/samba/patches/patch-bu 1.4 - pkgsrc/net/samba/patches/patch-bv 1.2 - pkgsrc/net/samba/patches/patch-cd removed Module Name: pkgsrc Committed By: tron Date: Sun Feb 11 18:39:04 UTC 2007 Modified Files: pkgsrc/net/samba: Makefile PLIST distinfo pkgsrc/net/samba/patches: patch-ab patch-af patch-ag patch-ai patch-al patch-at patch-au patch-aw patch-ay patch-ba patch-bb patch-bg patch-bi patch-bm patch-bn patch-bu patch-bv Removed Files: pkgsrc/net/samba/patches: patch-ad patch-bl patch-cd Log Message: Update "samba" package to version 3.0.24. Major changes since version 3.0.22: - CVE-2007-0452 (Potential Denial of Service bug in smbd) - CVE-2007-0453 (Buffer overrun in NSS host lookup Winbind NSS library on Solaris) - CVE-2007-0454 (Format string bug in afsacl.so VFS plugin) - Stability fixes for winbindd - Portability fixes on FreeBSD and Solaris operating systems. - Authentication failures in pam_winbind when the AD domain policy is set to not expire passwords. - Authorization failures when using smb.conf options such as "valid users" with the smbpasswd passdb backend. - Ambiguity with unqualified names in smb.conf parameters such as "force user" and "valid users". - Errors in 'net ads join' caused by bad IP address in the list of domain controllers. - SMB signing errors in the client and server code. - Domain join failures when using smbpasswd on a Samba PDC. - Failure to strip the domain name from groups when 'winbind use default domain =3D yes' - Failure in pam_winbind to correctly parse arguments. - Bad token creation of local users on member servers not running winbindd. - Failure to add users or groups to ACLs using the Windows object picker. - Failure in file serving code when 'kernel oplocks =3D yes'. - New "createupn" option to "net ads join" - Rewritten Kerberos keytab generation when 'use kerberos keytab =3D yes' - Improved 'make test' - New offline mode in winbindd. - New Kerberos support for pam_winbind.so. - New handling of unmapped users and groups. - New non-root share management tools. - Improved support for local and BUILTIN groups. - Winbind IDMAP integration with RFC2307 schema objects supported by Windows 2003 R2. - Rewritten 'net ads join' to mimic Windows XP without requiring administrative rights to join a domain. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.26 2007/02/11 18:39:04 tron Exp $ d3 3 a5 3 --- script/installbin.sh.in.orig 2007-02-04 18:59:25.000000000 +0000 +++ script/installbin.sh.in 2007-02-11 15:13:13.000000000 +0000 @@@@ -14,8 +14,7 @@@@ d7 17 a23 5 echo "Installing $p as $DESTDIR/$BINDIR/$p2 " if [ -f $DESTDIR/$BINDIR/$p2 ]; then - rm -f $DESTDIR/$BINDIR/$p2.old - mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old + rm -f $DESTDIR/$BINDIR/$p2 a24 2 cp $p $DESTDIR/$BINDIR/ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2 @ 1.24 log @Update net/samba to 3.0.20.2 from samba-3.0.20b. Recommended patches for samba-3.0.20b that are applied as part of this update include: http://www.samba.org/samba/patches/print_lprm.patch http://www.samba.org/samba/patches/quota.patch http://www.samba.org/samba/patches/bug3201_wbinfo.patch This fixes PRs pkg/31352 and pkg/31991. Important changes that were made as part of porting this Samba release to pkgsrc include the following: * The new release model for Samba includes distributing patches for urgent bug fixes that will be included in the next release of Samba, and are available at http://www.samba.org/samba/patches/. Since these patches are rather generically named, we download all DISTFILES and PATCHFILES for Samba into a ${DISTNAME}-specific directory. * The default configuration for the samba package no longer builds the "winbind" portions of samba, which are really only useful when attempting to unify logons between Unix and Microsoft Windows. When the "winbind" option is specified, we also build the RID and AD idmap backends, which allow sharing UIDs/GIDs across Unix machines. * New package options have been added to the build: "mysql", "pgsql", and "xml" allow adding optional support for experimental passdb storage backends, and "winbind" allows for optionally building the winbindd daemon and associated plugins. * Two new smb.conf options were added -- "passwd expand gecos" and "state directory". The first describes whether "&" in the GECOS field of a passwd db entry is expanded to the login name. The second describes the location where the persistent-state database files are stored. * Luke Mewburn contributed code to allow nss_winbind.so to work properly on supported NetBSD systems. The FreeBSD NSS winbind code should probably be replaced with a suitably tweaked version of the NetBSD code since the latter is much more complete in the functions that are provided, but I'll leave that to freebsd-pkg-people. * Samba dumps all of its files into "lock directory", but some of them need to persist across reboots. We make a distinction between these files and the temporary files that are re-created by the Samba daemons when they are restarted -- the former are now stored in a "state directory" and the latter are stored in the "lock directory". This is modeled after the Debian patch to Samba located in: packaging/Debian/debian-unstable/patches/fhs.patch The "lock directory" default has been moved to ${VARBASE}/run/samba to emphasize the temporary status of the files stored in that directory. * Samba persists in using PAM_AUTHTOK_RECOVER_ERR, when there is almost universal agreement that PAM_AUTHTOK_RECOVERY_ERR is the right constant to use. Even the Linux-PAM distribution ensures that PAM_AUTHTOK_RECOVERY_ERR is correctly defined. To work around this, we define PAM_AUTHTOK_RECOVER_ERR appropriately in all the places where it is used. * The configure script checks for OpenSSL's libcrypto.so by looking for the symbol "des_set_key". However, libcrypto.so might not contain that symbol because the DES functions might come from a separate library, e.g. libdes.so. In this case, the configure script will think that libcrypto.so is not available, when it actually may be. Instead, look for EVP_des_cbc, which is always provided by libcrypto.so. * Add some missing $(PASSDB_LIBS) references to the Makefile to fix compilation problems if the experimental passdb backends are statically compiled into the Samba suite programs. * Fix compilation problems in sam/idmap_rid.c and sam/idmap_ad.c if the "rid" and "ad" idmap backends are statically compiled into winbindd. Changes between version 3.0.14a and 3.0.20b include: o Reporting files as read-only instead of returning the correct error code of "access denied" o File system quota support defects o Crash bugs caused by incompatibilities on 64-bit systems. o User Manager interoperability problems. o Support for several new Win32 rpc pipes. o New 'net rpc service' tool for managing Win32 services. o Capability to set the owner on new files and directory based on the parent's ownership. o Experimental, asynchronous IO file serving support. o Support for Microsoft Print Migrator. o New Winbind IDmap plugin (ad) for retrieving uid and gid from AD servers which maintain the SFU user and group attributes. o Rewritten support for POSIX pathnames when utilizing the Linux CIFS fs client. o New asynchronous winbindd. o New Windows NT registry file I/O library. o New user right (SeTakeOwnershipPrivilege) added. o New "net share migrate" options. @ text @d1 1 a1 1 $NetBSD$ d3 9 a11 3 --- script/installbin.sh.orig 2005-10-12 13:03:44.000000000 -0400 +++ script/installbin.sh @@@@ -22,11 +22,12 @@@@ for p in $*; do @ 1.23 log @Strip binaries on install @ text @d3 1 a3 1 --- script/installbin.sh.orig 2004-09-15 10:28:42.000000000 +0000 d5 1 a5 1 @@@@ -22,6 +22,7 @@@@ for p in $*; do d13 6 @ 1.22 log @Update net/samba to 3.0.2a. Fixes from version 3.0.1 include: o Joining a Samba domain from Pre-SP2 Windows 2000 clients. o Logging onto a Samba domain from Windows XP clients. o Problems with the %U and %u smb.conf variables in relation to Windows 9x/ME clients. o Kerberos failures due to an invalid in memory keytab detection test. o Updates to the ntlm_auth tool. o Fixes for various SMB signing errors. o Better separation of WINS and DNS queries for domain controllers. o Issues with nss_winbind FreeBSD and Solaris. o Several crash bugs in smbd and winbindd. o Output formatting fixes for smbclient for better compatibility with scripts based on the 2.2 version. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.21 2004/01/11 02:26:31 jlam Exp $ d3 7 a9 3 --- configure.orig Mon Dec 15 09:55:22 2003 +++ configure @@@@ -20216,7 +20216,7 @@@@ echo "${ECHO_T}no" >&6 d11 2 a12 7 if test "$ICONV_FOUND" = yes; then - LDFLAGS=$save_LDFLAG + LDFLAGS=$save_LDFLAGS if test ""$i/lib"" != "/usr/lib" ; then LDFLAGS="$LDFLAGS -L"$i/lib"" @ 1.21 log @Update net/samba to 3.0.1. Major changes from version 2.2.8anb6 include: * Active Directory support. Samba is able to join a ADS realm as a member server and authenticate using LDAP/Kerberos. * Unicode support. * New, more flexible authentication (passdb) system. * A new "net" command that is similar to the "net" command in Windows. * Samba now negotiates NT-style status32 codes on the wire, which greatly improves error handling. * Better Windows 2K/2K3/XP printing support. * Loadable module support for passdb backends and character sets. * More performant winbindd. * Support for migrating from a Windows NT4 domain to a Samba domain and maintaining user, group, and domain SIDs. * Support for establishing trust relationships with Windows NT4 DCs. * Initial support for a distributed Winbind architecture using an LDAP directory for storing SID-to-uid/gid mappings. * Major updates to the Samba documentation tree. * Full support for client and server SMB signing to ensure compatibility with default Windows 2K3 security settings. * Improvement of ACL mapping features. @ text @d1 1 a1 1 $NetBSD$ @ 1.20 log @Updated samba to 2.2.8 **************************************** * IMPORTANT: Security bugfix for Samba * **************************************** The SuSE security audit team, in particular Sebastian Krahmer , has found a flaw in the Samba main smbd code which could allow an external attacker to remotely and anonymously gain Super User (root) privileges on a server running a Samba server. This flaw exists in previous versions of Samba from 2.0.x to 2.2.7a inclusive. This is a serious problem and all sites should either upgrade to Samba 2.2.8 immediately or prohibit access to TCP ports 139 and 445. Advice created by Andrew Tridgell, the leader of the Samba Team, on how to protect an unpatched Samba server is given at the end of this section. The SMB/CIFS protocol implemented by Samba is vulnerable to many attacks, even without specific security holes. The TCP ports 139 and the new port 445 (used by Win2k and the Samba 3.0 alpha code in particular) should never be exposed to untrusted networks. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.19 2002/12/13 08:37:11 martti Exp $ d3 3 a5 4 --- configure.orig Fri Feb 28 15:56:18 2003 +++ configure Sun Mar 16 09:01:58 2003 @@@@ -12074,6 +12074,49 @@@@ fi d8 6 a13 54 +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 <&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 @@@@ -14491,6 +14534,7 @@@@ 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 @ 1.19 log @Updated samba to 2.2.7a 1) Fix for smbclient reporting negative file sizes on dir command and negative statistics being reported when using put or get on large files. 2) Fix bug in determination of allocation size 3) Fix 64bit size problems which prevented copying of files larger than 2 GBytes. 4) Fix for xcopy /s problem with old DOS clients not sending correct attributes on subsequent SMBsearch calls. 5) Fix bug in call to standard_sub_advanced giving a 0 length. This fixes the string overflow in string_sub errors. 6) Correctly handle querygroup rpcclient command 7) fix broken incremental tar in smbtar command @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.18 2002/10/18 11:50:28 martti Exp $ d3 3 a5 3 --- configure.orig Tue Dec 10 02:01:00 2002 +++ configure Fri Dec 13 08:33:48 2002 @@@@ -12039,6 +12039,49 @@@@ d55 1 a55 1 @@@@ -14408,6 +14451,7 @@@@ @ 1.19.2.1 log @Pullup rev 1.20 (requested by bouyer in ticket #1220) Updated samba to 2.2.8 **************************************** * IMPORTANT: Security bugfix for Samba * **************************************** The SuSE security audit team, in particular Sebastian Krahmer , has found a flaw in the Samba main smbd code which could allow an external attacker to remotely and anonymously gain Super User (root) privileges on a server running a Samba server. This flaw exists in previous versions of Samba from 2.0.x to 2.2.7a inclusive. This is a serious problem and all sites should either upgrade to Samba 2.2.8 immediately or prohibit access to TCP ports 139 and 445. Advice created by Andrew Tridgell, the leader of the Samba Team, on how to protect an unpatched Samba server is given at the end of this section. The SMB/CIFS protocol implemented by Samba is vulnerable to many attacks, even without specific security holes. The TCP ports 139 and the new port 445 (used by Win2k and the Samba 3.0 alpha code in particular) should never be exposed to untrusted networks. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.orig Fri Feb 28 15:56:18 2003 +++ configure Sun Mar 16 09:01:58 2003 @@@@ -12074,6 +12074,49 @@@@ d55 1 a55 1 @@@@ -14491,6 +14534,7 @@@@ @ 1.18 log @Updated samba to 2.2.6 * Fixes for MS-RPC printing issues affecting Windows 2000 clients * New support for smb.conf generation in SWAT * Inclusion of several performance enhancements * Fixes for several file locking bugs and returned status codes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $ d3 3 a5 3 --- configure.orig Wed Oct 9 22:27:21 2002 +++ configure Fri Oct 18 13:01:38 2002 @@@@ -11993,6 +11993,49 @@@@ d55 1 a55 1 @@@@ -14362,6 +14405,7 @@@@ @ 1.17 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14.2.2 2002/08/25 21:20:33 jlam Exp $ d3 3 a5 3 --- configure.orig Sun Jul 28 18:13:04 2002 +++ configure @@@@ -11945,6 +11945,49 @@@@ else d55 1 a55 1 @@@@ -13787,6 +13830,7 @@@@ s%@@TERMLIBS@@%$TERMLIBS%g @ 1.16 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Update net/samba to version 2.2.5. The quick summary of changes from version 2.2.4nb1 is that there are the usual minor bug fixes, plus some important ones: * fix printing with Win2K/XP clients * fixes related to using LDAP for the SAM * fixes related to changing passwords Pkgsrc changes: * Fetch the .tar.bz2 file -- it's smaller. * Use smb.conf.default as the sample config file and get rid of the homegrown files/smb.conf.sample. smb.conf.default is more informative and is a better resource. * Remove irrelevant examples. * Move convert_smbpasswd script to the examples/samba/misc directory. It's pretty much outlived it's usefulness at this point of the Samba release cycle. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $ d3 1 a3 1 --- configure.orig Fri May 3 10:02:45 2002 d5 58 a62 20 @@@@ -1017,16 +1017,16 @@@@ codepagedir="\$(DATADIR)/samba/codepages" configdir="${sysconfdir}/samba" lockdir="\${VARDIR}/cache/samba" - piddir="\$(VARDIR)/run/samba" + piddir="\$(VARDIR)/run" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" swatdir="\${DATADIR}/samba/swat" else codepagedir="\$(LIBDIR)/codepages" configdir="\$(LIBDIR)" - logfilebase="\$(VARDIR)" + logfilebase="\$(VARDIR)/log" lockdir="\${VARDIR}/locks" - piddir="\$(VARDIR)/locks" + piddir="\$(VARDIR)/run" privatedir="\${prefix}/private" swatdir="\${prefix}/swat" fi; @ 1.14 log @update samba package to 2.2.4. WHAT'S NEW IN Samba 2.2.4 - 2nd May 2002 ========================================= This is the latest stable release of Samba. This is the version that all production Samba servers should be running for all current bug-fixes. There have been several fixes and internal enhancements which include: * More/better SPOOLSS printing functionality for Windows NT/2k/XP clients. * Several fixes relating to serving PC database files such as (Access and FoxPro) from a Samba file share. * Several improves in Samba's VFS layer which can be seen in the inclusion of a "Recycle Bin" vfs module. See examples/VFS/README for more details on this. * Addition of a tool (tdbbackup) for backup/restore of Samba's tdb's * Continued improvements to winbind for greater scalability and stability * Several fixes related to Samba's MS-DFS support * Rpcclient's various printer commands now work (again) New/Changed parameters in 2.2.4 -------------------------------- For more information on these parameters, see the man pages for smb.conf(5). Added/changed parameters ------------------------ * csc policy * inherit acls * nt status support * lock spin count * lock spin time * pid directory * winbind use default domain Depreciated parameters ---------------------- The following parameters have been marked as depreciated and will be removed in Samba 3.0 * postscript * printer driver * printer driver file * printer driver location Removed Parameters ------------------ none Changes in 2.2.4 ---------------- See the cvs log for SAMBA_2_2 for more details 1) added -c option to smbpasswd 2) reworked smbpasswd internal command line option parsing 3) small various bug fixes to experimental pdb_tdb.c 4) Enforce spoolss RPCs based on the access granted at PrinterOpen() 5) Added missing access checks to [add/delete/set]form 6) Compile fixes for pam_smbpass 7) fix smbd crash when netbios session request fails from spoolss_connect_to_client(). 8) fixed logic bug that prevent SetPrinter() from storing devmode 9) Removed extra get_printer_snum() calls from set_printer_hnd_name() 10) fix joining domain on big endian machine when using -U to smbpasswd 11) allow command line arg to override smb.conf log level 12) continue to retry to register 1b name with wins server if there is an old IP there 13) fix smbclient print crash bug 14) 9x pnp fix when the config file and driver file are different 15) force testparm to print the correct value for log level 16) fix swat to show full log level info 17) fix server GetPrinterData() fields to be more sensible 18) fix logic error in SetPrinterDataEx() 19) Only set smb_read_error if not already set 20) Fix string returns that require unicode 21) Merge of printing performance fixes from appliance 22) lpq parsing fixes 23) Back port tridge's xcopy /o fix from HEAD 24) Fix the printer change notify code (unfinished) 25) Patch for Domain users not showing up 26) Fixed SetPrinterData(magic key) to support zero length DEVMODE 27) Ensure that all methods of looking up and connecting to DC's work using identical logic. 28) Merge in the mutex code to stop multiple domain logon failure 29) Ignore 0/0 lock 30) Fix winbindd to respect command line debuglevel as nmbd/smbd 31) Update with tdbbackup from HEAD 32) Fix for typo on solaris nss 33) Merge in the locking changes from HEAD 34) Added POSIX ACL layer into the vfs 35) Fix the returning of domain enum 36) Fix the generation of the MACHINE.SID file into the secrets.tdb. 37) Enable test for -rdynamic when building binaries 38) Remove the "stat open" code - make it inline 39) Fix the mp3 rename bug 40) Fix for Explorer DFS problems on older Windows 9X machines 41) implement OpenPrinter() opnum == 0x01 42) Matched W2K *insane* open semantics.... 43) small fix that will prevent the "failed to marshall R_NET_SAMLOGON" message in the logs 42) don't do checking of local passdb in smbpasswd if using -r option 43) fix "smbpasswd -j DOMAIN -r * -U Admin%XXXX" so that it doesn't try to connect to a server named '*' 44) merge rpcclient code from HEAD 45) Ensure MACHINE.SID update done before child spawns 46) Fix the bad path errors for mkdir so mkdir \a\b\c\d works 47) Removed --with-vfs - always built if available 48) Fixed psec for 2.2 49) Fixed the handle leak in the connection management code 50) fix disable spoolss after the switch to nt status codes 51) Added Shirish's client side caching policy change 52) Honor the specversion when parsing the the DEVICEMODE 53) fix parsing bug when DEVICEMODE's private data does not end on a 4 byte boundary 54) do not idle an smbd when there is an open pipe 55) when a new driver is added to a Samba server, cycle through all printers and bump the change_id for each one bound to the driver 56) allow smbclient to work with a FIFO as well (needed for KDE ioslave) 57) various updates to pdb_nisplus.c 58) many small documentation updates 59) removed many compiler warnings Known Bugs ---------- * Under certain conditions when serving the MS Access 2000 executable file and an Access database from a Samba share, it is possible to experience data corruption. This pug does does occur when the database is served from a Samba file share but the Access *.exe is stored on the client's local file system. The exact reason for this bug is unknown at this time. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.13 2002/02/05 00:36:26 taca Exp $ @ 1.14.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $ @ 1.14.2.2 log @Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.16 2002/07/30 23:05:13 jlam Exp $ d3 1 a3 1 --- configure.orig Sun Jul 28 18:13:04 2002 d5 20 a24 58 @@@@ -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 <&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 @ 1.13 log @(1) Change Samba's "lockdir" from /var/run/samba to /var/db/samba. (2) Add "piddir" as /var/run and "pidfile dir" and "pidfile directory" statement for smb.conf. (3) Some fix for password synchronization but it isn't tested much and it is almost useless under "encrypt passwords = yes" environment. Changes for INSTALL and part of Makefile are provided by "Johnny C. Lam" and (2) and (3) are got from FreeBSD ports. Bump revision to 1; samba-2.2.3nb1 now. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig Sun Feb 3 09:46:35 2002 d5 1 a5 10 @@@@ -19,6 +19,8 @@@@ ac_help="$ac_help --with-lockdir=DIR Where to put lock files ($ac_default_prefix/var/locks)" ac_help="$ac_help + --with-piddir=DIR Where to put lock files (\${VARDIR}/run)" +ac_help="$ac_help --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)" ac_help="$ac_help --with-configdir=DIR Where to put configuration files (\$libdir)" @@@@ -604,6 +606,7 @@@@ d9 1 d14 1 a14 1 @@@@ -611,7 +614,8 @@@@ a16 1 lockdir="\$(VARDIR)/locks" a17 1 + piddir="\${VARDIR}/run" d19 3 d24 1 a24 35 fi @@@@ -656,6 +660,25 @@@@ ################################################# +# set pid directory location +# Check whether --with-piddir or --without-piddir was given. +if test "${with_piddir+set}" = set; then + withval="$with_piddir" + case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + echo "configure: warning: --with-piddir called without argument - will use default" 1>&2 + ;; + * ) + piddir="$withval" + ;; + esac +fi + + +################################################# # set SWAT directory location # Check whether --with-swatdir or --without-swatdir was given. if test "${with_swatdir+set}" = set; then @@@@ -13167,6 +13190,7 @@@@ s%@@configdir@@%$configdir%g s%@@lockdir@@%$lockdir%g s%@@logfilebase@@%$logfilebase%g +s%@@piddir@@%$piddir%g s%@@privatedir@@%$privatedir%g s%@@swatdir@@%$swatdir%g s%@@RUNPROG@@%$RUNPROG%g @ 1.12 log @Convert to use buildlink.mk files and remove unnecessary config.cache entry to prevent finding libncurses and unnecessary patches to configure script to handle SSL location and probing libcups. Also use FILES_SUBST instead of repeating a sed script throughout the Makefile. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2001/05/22 21:49:29 jlam Exp $ d3 3 a5 5 --- configure.orig Tue Apr 17 01:44:24 2001 +++ configure Tue May 22 16:07:36 2001 @@@@ -40,6 +40,9 @@@@ --with-readline[=DIR] Look for readline include/libs in DIR --without-readline Don't include readline support" d7 3 a9 2 + --with-cups Include CUPS support + --without-cups Don't include CUPS support (default)" d11 1 a11 2 --with-smbwrapper Include SMB wrapper support --without-smbwrapper Don't include SMB wrapper support (default)" d13 18 a30 1 @@@@ -3870,58 +3873,9 @@@@ d32 1 d35 5 a39 67 -# we need libcups for CUPS support... -echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6 -echo "configure:3876: checking for httpConnect in -lcups" >&5 -ac_lib_var=`echo cups'_'httpConnect | 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="-lcups $LIBS" -cat > conftest.$ac_ext <&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 - ac_tr_lib=HAVE_LIB`echo cups | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - # we need libdl for PAM and the new VFS code echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3925: checking for dlopen in -ldl" >&5 +echo "configure:3879: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -11044,10 +10998,78 @@@@ fi +################################################ +# check for CUPS support +echo $ac_n "checking whether to use CUPS""... $ac_c" 1>&6 +echo "configure:11005: checking whether to use CUPS" >&5 +# Check whether --with-cups or --without-cups was given. +if test "${with_cups+set}" = set; then + withval="$with_cups" d41 8 a48 49 + yes) + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6 +echo "configure:11013: checking for httpConnect in -lcups" >&5 +ac_lib_var=`echo cups'_'httpConnect | 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="-lcups $LIBS" +cat > conftest.$ac_ext <&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 + ac_tr_lib=HAVE_LIB`echo cups | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + d50 1 a50 7 + *) + echo "$ac_t""no" 1>&6 + ;; + esac +else + echo "$ac_t""no" 1>&6 + d54 12 a65 30 ################################################# # check for smbwrapper support echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6 -echo "configure:11051: checking whether to use smbwrapper" >&5 +echo "configure:11073: checking whether to use smbwrapper" >&5 # Check whether --with-smbwrapper or --without-smbwrapper was given. if test "${with_smbwrapper+set}" = set; then withval="$with_smbwrapper" @@@@ -11427,6 +11449,9 @@@@ LIBS="-lssl -lcrypto $LIBS" LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS" ;; + /usr) + LIBS="-lssl -lcrypto $LIBS" + ;; * ) CFLAGS="-I${withval}/include $CFLAGS" LIBS="-lssl -lcrypto $LIBS" @@@@ -11441,11 +11466,6 @@@@ LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS" fi - - 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 - exit 1 - fi CFLAGS="-DHAVE_CRYPT_DECL $CFLAGS" # Damn, SSLeay defines its own @ 1.11 log @Use devel/readline/Makefile.readline for GNU readline support and note why GNU readline is required. Clean up how to pass location of OpenSSL headers to the configure script. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Update samba to 2.2.0. Changes from version 2.0.9 include: * Integration between Windows oplocks and NFS file opens (IRIX and Linux 2.4 kernel only). This gives complete data and locking integrity between Windows and UNIX file access to the same data files. * Ability to act as an authentication source for Windows 2000 clients as well as for NT4.x clients. * Integration with the winbind daemon that provides a single sign on facility for UNIX servers in Windows 2000/NT4 networks driven by a Windows 2000/NT4 PDC. * Support for native Windows 2000/NT4 printing RPCs. This includes support for automatic printer driver download. * Support for server supported Access Control Lists (ACLs). * On PAM (Pluggable Authentication Module) based systems - better debugging messages and encrypted password users now have access control verified via PAM - Note: Authentication still uses the encrypted password database. * Rewritten internal locking semantics for more robustness. This release supports full 64 bit locking semantics on all (even 32 bit) platforms. SMB locks are mapped onto POSIX locks (32 bit or 64 bit) as the underlying system allows. * Conversion of various internal flat data structures to use database records for increased performance and flexibility. * Support for acting as a MS-DFS (Distributed File System) server. * Support for manipulating Samba shares using Windows client tools (server manager). Per share security can be set using these tools and Samba will obey the access restrictions applied. * Samba profiling support * Compile time option for enabling a (Virtual file system) VFS layer to allow non-disk resources to be exported as Windows filesystems (such as databases etc.). @ text @d4 1 a4 1 +++ configure d155 22 @ 1.9 log @Update samba to 2.0.9: Samba 2.0.9 is a security bugfix release which correctly fixes the problem 2.0.8 was supposed to address. (A bug in the handling of temporary files that allowed local users to destroy data on local devices). @ text @d3 152 a154 12 --- acconfig.h.orig Wed Apr 18 00:00:52 2001 +++ acconfig.h @@@@ -79,7 +79,9 @@@@ #undef SIZEOF_INO_T #undef SIZEOF_OFF_T #undef STAT_STATVFS64 +#undef HAVE_READLINE #undef HAVE_LIBREADLINE +#undef HAVE_LIBEDIT #undef HAVE_KERNEL_OPLOCKS #undef HAVE_IRIX_SPECIFIC_CAPABILITIES #undef HAVE_INT16_FROM_RPC_RPC_H @ 1.8 log @Remove readline dependency for systems whose libedit.a has readline emulation. I've finally learned enough autoconf voodoo to do this the right way :) Also preliminary preparations for CUPS (IPP) support. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 1999/11/16 21:01:05 jlam Exp $ d3 12 a14 20 --- configure.orig Wed Oct 13 01:26:42 1999 +++ configure Tue Nov 16 10:40:35 1999 @@@@ -3478,7 +3478,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&6 @ 1.7 log @* Update samba to 2.0.6. * It turns out -lreadline also needs -ltermcap to link under ELF. I had to patch the GNU configure script to make it correctly detect readline. Are we going to have to do this to all the packages which depend upon readline? New/Changed parameters in 2.0.6 ------------------------------- There are 6 new parameters in the smb.conf file. wins hook This parameter allows an external program to be called on all changes to a Samba WINS database, allowing dynamic DNS updates. debug hires timestamp debug pid debug uid The above 3 parameters provide greater debug information. preexec close rootpreexec close The above 2 parameters control the action taken on the success or failure of a 'preexec' script. There is also one removed parameter. mangle locks The addition of these new parameters and the removal of the old is described in more detail in the smb.conf man page, When using "security=domain" the "password server" parameter can now be set to the string "*', which will cause Samba to search for Domain controllers in the same way that Windows NT does. See the smb.conf man page for more details. The "interfaces" parameter in smb.conf can now be dynamically detected on startup and can also now take an interface name such as eth0. See the smb.conf man page for the details on the new features of the "interfaces" parameter. nmbd has been enhanced to use this feature. The syntax for the Linux-specific smbmount command has been changed and is now compatible with the standard mount command. See the modified smbmount man page for details. Support for the UNIX CUPS printer standard has been added. See www.cups.org for details. Thanks to the folks at Easy Software Products for this code. Set the printcap name to "cups" to enable this. See the smb.conf man page for details. Changes in 2.0.6 ----------------- 1). 64-bit locking removed from Linux autoconf build. This fixes several Linux specific locking issues. 2). Crash bug fix in smbclient recursive processing. Fix from E. Jay Berkenbilt (ejb@@ql.org). 3). "history" command added to smbclient if readline available. 4). smbtar - updates files and directory message on restore. 5). smbmnt - 'u', 'g', 'r', 'f', 'd' options added by Andrew. See man page for details. 6). smbmount updated to be useable by autofs on Linux. See the samba/examples/autofs/README file for details. 7). Bug fixed where TCP_NODELAY was not being used by default in smbd. 8). Many oplock fixes. Samba now waits 30 seconds, not 45. Also smbd no longer aborts on client break failure, but logs a message and continues. This is what NT does. This should fix many "oplock break" message problems people have been having. 9). New code from Andrew to dynamically detect interfaces. nmbd will now attempt to dynamically detect interface changes and register names as an interface goes "up". 10). Win95 ioctl for print jobs added by Matt. 11). Mapping for ISO8859-1 extended for codepage 437 and 850. 12). Code Page 737 -> ISO-8859-7 (Greek-Hellenic) mapping added. 13). Character strings now correctly converted from UNIX character set format to DOS codepage when read from smb.conf or external passwd or group files. Samba is now much more careful about what format external strings should be converted to/from. 14). snprintf crash fix for IRIX 6.2 and below. 15). Increased timestamp debug fixes (adds milliseconds and uid/pid if requested). 16). Optimisation for wildcard exact match requests. 17). Win95 wildcard semantics fix - unused code removed. 18). 'mangle locks' parameter removed. This now done automatically. 19). setXid() routines re-written to provide asserts and also to fix AIX versions prior to 4.1.x. 20). MSG_WAITALL optimisation removed due to bugs in FreeBSD. 21). Length fix when writing UNICODE string. 22). oplock processing added to libsmb client code. 23). Added more client error message strings. 24). Fix bug with connecting to encrypted server when non-encrypted password given. 25). In security=domain, password server extended to search for DC's if parameter = '*'. 26). "root did not create samaphore" bug fixed. 27). random generator initialized early to prevent icons not showing up in Win9x. 28). Logging fix after SIGHUP. 29). WINS hook external call added when nmbd is a WINS server. 30). Support for CUPS printer protocol added by Michael Sweet. 31). Support for NIS+ backend password database updates. 32). Handle dashes in print job id's. Fix from Dom.Mitchell@@palmerharvey.co.uk 33). Race condition in UNIX password sync on some platforms fixed by Matt. 34). Dirptr leak from Win98 fixed. 35). Logic bug in handling of level II oplocks fixed. 36). smbd crash bug fix when opening directories. 37). Paranoia oplock fix from Charles Hoch (hoch@@exemplary.com) 38). Fix Win2k problem where DCE/RPC is done on SMBwrite as well as SMBwriteX. 39). Fix Win95 redirector alignment bug that caused oplock break failures. 40). Preexec close code added. 41). Extra sanity checks in testparm code. 42). oplock tests added to smbtorture. 43). Tell SWAT user if logged in as root or not. 44). Solaris packaging fixes donated by VERITAS. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Samba 1.9.18 is dead, upgrade to samba 2.0.2. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 1998/09/04 19:17:19 bad Exp $ d3 14 a16 5 --- includes.h.orig Thu Aug 20 01:41:46 1998 +++ includes.h Tue Sep 1 17:35:13 1998 @@@@ -200,7 +200,7 @@@@ #include #endif d18 2 a19 4 -#if defined(SHADOW_PWD) && !defined(NETBSD) && !defined(FreeBSD) && !defined(CONVEX) && !defined(__OpenBSD__) +#if defined(SHADOW_PWD) && !defined(CONVEX) && !defined(__NetBSD__) #include #endif d21 2 a22 127 @@@@ -518,23 +518,22 @@@@ #endif -#ifdef NETBSD -#ifdef NetBSD1_3 -#include +#ifdef __NetBSD__ +#include +#include +#include #ifdef ALLOW_CHANGE_PASSWORD #include #endif /* ALLOW_CHANGE_PASSWORD */ -#else /* NetBSD1_3 */ -#include -#endif /* NetBSD1_3 */ -#include -#include -#include -/* you may not need this */ #define NO_GETSPNAM #define SIGNAL_CAST (void (*)()) -#define USE_DIRECT -#define REPLACE_INNETGR +#define HAVE_BZERO +#define HAVE_PATHCONF +#define HAVE_GETGRNAM 1 +#define HAVE_GETTIMEOFDAY +#define HAVE_MEMMOVE +#define USE_GETCWD +#define USE_SETSID #endif --- interface.c.orig Tue May 5 01:27:35 1998 +++ interface.c Wed Jun 17 14:57:01 1998 @@@@ -161,7 +161,7 @@@@ } } } -#elif defined(__FreeBSD__) || defined(NETBSD) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(AMIGA) || defined(_AIX41) || defined(__OpenBSD__) ifc.ifc_len = sizeof(buff); ifc.ifc_buf = buff; if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) { --- quotas.c.orig Wed May 13 03:46:55 1998 +++ quotas.c Wed Jun 17 14:57:01 1998 @@@@ -548,7 +548,7 @@@@ #else -#if defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #include #include #elif AIX @@@@ -558,7 +558,7 @@@@ #define dqb_curfiles dqb_curinodes #define dqb_fhardlimit dqb_ihardlimit #define dqb_fsoftlimit dqb_isoftlimit -#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ +#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */ #include #include #endif @@@@ -571,7 +571,7 @@@@ uid_t euser_id; int r; struct dqblk D; -#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) +#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__NetBSD__) char dev_disk[256]; struct stat S; /* find the block device file */ @@@@ -593,7 +593,7 @@@@ DEBUG(5,("Unable to reset uid to %d\n", user_id)); } #else /* USE_SETRES */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) { /* FreeBSD patches from Marty Moll */ uid_t user_id; @@@@ -617,17 +617,17 @@@@ /* AIX has both USER and GROUP quotas: Get the USER quota (ohnielse@@fysik.dtu.dk) */ r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D); -#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ +#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */ r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D); -#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ +#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */ #endif /* USE_SETRES */ /* Use softlimit to determine disk space, except when it has been exceeded */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) *bsize = DEV_BSIZE; -#else /* !__FreeBSD__ && !__OpenBSD__ */ +#else /* !__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */ *bsize = 1024; -#endif /*!__FreeBSD__ && !__OpenBSD__ */ +#endif /*!__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */ if (r) { @@@@ -643,7 +643,7 @@@@ return(False); /* Use softlimit to determine disk space, except when it has been exceeded */ if ((D.dqb_curblocks>D.dqb_bsoftlimit) -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0)) #endif ) { --- util.c.orig Sat Jun 13 03:44:21 1998 +++ util.c Wed Jun 17 14:57:01 1998 @@@@ -3614,7 +3614,7 @@@@ bzero((char *)&sock,sizeof(sock)); memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length); -#if defined(__FreeBSD__) || defined(NETBSD) || defined(__OpenBSD__) /* XXX not the right ifdef */ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* XXX not the right ifdef */ sock.sin_len = sizeof(sock); #endif sock.sin_port = htons( port ); @ 1.5 log @Update to samba-1.9.18p10. While here clean up the package somewhat: - Remove confusion about where the SAMBA_PRIVATE directory is. - Don't gratitously create yet another world writeable directory. - Don't use $PREFIX as the WEB_ROOT, use the htdocs directory from the Apache pkg instead. - Enable use of netgroups, checking of disk quotas and the password changing feature. - Use /var/run/samba for runtime status files. - Always install the example startup file. - Misc. minor modification for better maintainability. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 1998/08/07 11:10:54 agc Exp $ @ 1.4 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- includes.h.orig Sat Jun 13 03:44:19 1998 +++ includes.h Wed Jun 17 15:03:22 1998 @@@@ -198,7 +198,7 @@@@ d10 1 a10 1 +#if defined(SHADOW_PWD) && !defined(CONVEX) d14 1 a14 1 @@@@ -510,23 +510,21 @@@@ d35 1 a35 1 -#define NO_GETSPNAM @ 1.3 log @Update to 1.9.18p8. @ text @d1 2 @ 1.2 log @Upgrade to samba version 1.9.18p7, from Ty Sarna in PR pkg/5529. @ text @d1 2 a2 9 $NetBSD: patch-ab,v 1.1 1998/01/12 17:31:16 agc Exp $ Note: I (tsarna@@endicor.com) have submitted the patches in this file plus a more generic Makefile patch (ie, without the pkgsrc changes) to the Samba group. I hope this file can be deleted when this package is updated for the next version of Samba. --- includes.h.orig Tue May 12 20:46:49 1998 +++ includes.h Tue Jun 2 15:46:07 1998 d12 1 a12 1 @@@@ -506,21 +506,22 @@@@ a18 1 + d30 2 d47 2 a48 3 --- interface.c.orig Fri Jan 9 17:22:01 1998 +++ interface.c Fri Jan 9 17:22:13 1998 d58 3 a60 3 --- quotas.c.orig Fri Jan 9 17:27:17 1998 +++ quotas.c Fri Jan 9 17:29:13 1998 @@@@ -546,7 +546,7 @@@@ d69 1 a69 1 @@@@ -556,7 +556,7 @@@@ d78 1 a78 1 @@@@ -569,7 +569,7 @@@@ d87 1 a87 1 @@@@ -591,7 +591,7 @@@@ d96 1 a96 1 @@@@ -615,17 +615,17 @@@@ d119 1 a119 1 @@@@ -641,7 +641,7 @@@@ d128 3 a130 3 --- util.c.orig Fri Jan 9 17:22:58 1998 +++ util.c Fri Jan 9 17:23:05 1998 @@@@ -3352,7 +3352,7 @@@@ @ 1.1 log @Additional patches for 1.9.18 from Ty Sarna (tsarna@@endicor.com) @ text @d1 1 a1 1 $NetBSD$ d8 3 a10 3 --- includes.h.orig Fri Jan 9 17:24:10 1998 +++ includes.h Fri Jan 9 17:37:08 1998 @@@@ -193,7 +193,7 @@@@ d19 1 a19 1 @@@@ -492,16 +492,19 @@@@ d23 4 a26 1 -#ifdef NETBSD d29 9 a37 2 #include #include a50 1 - d53 1 a53 1 #ifdef FreeBSD @