auto-import samba-2.2.3a-0.72 from samba-2.2.3a-0.72.src.rpm

This commit is contained in:
cvsdist 2004-09-09 12:04:08 +00:00
parent 35c415a83a
commit 5470a986b1
7 changed files with 203 additions and 37 deletions

View File

@ -1,3 +1,3 @@
samba-2.2.1a.tar.bz2 samba-2.2.3a.tar.bz2
samba-j-2.patch.bz2 samba-j-2.patch.bz2
samba-j.patch.bz2 samba-j.patch.bz2

View File

@ -4,6 +4,6 @@
sharedscripts sharedscripts
copytruncate copytruncate
postrotate postrotate
/bin/kill -HUP `cat /var/lock/samba/*.pid 2> /dev/null` 2> /dev/null || true /bin/kill -HUP `cat /var/log/samba/*.pid 2> /dev/null` 2> /dev/null || true
endscript endscript
} }

View File

@ -3,8 +3,8 @@
Summary: The Samba SMB server. Summary: The Samba SMB server.
Name: samba Name: samba
Version: 2.2.1a Version: 2.2.3a
Release: 5s.1 Release: 0.72
License: GNU GPL Version 2 License: GNU GPL Version 2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.samba.org/ URL: http://www.samba.org/
@ -19,34 +19,31 @@ Source4: samba.sysconfig
Source5: smb.init Source5: smb.init
Source6: samba.pamd Source6: samba.pamd
Source7: smbprint Source7: smbprint
Source8: winbind.init
# generic patches # generic patches
Patch0: samba-2.2.1a-smb.conf.patch Patch0: samba-2.2.2-smb.conf.patch
Patch1: samba-2.2.0-smbw.patch Patch1: samba-2.2.0-smbw.patch
Patch3: samba-2.0.5a-gawk.patch Patch3: samba-2.0.5a-gawk.patch
Patch4: samba-ia64.patch
Patch5: samba-2.0.7-krb5-1.2.patch Patch5: samba-2.0.7-krb5-1.2.patch
Patch6: samba-2.0.7-buildroot.patch Patch6: samba-2.0.7-buildroot.patch
Patch7: samba-2.0.7-quota.patch
Patch8: samba-2.2.0-smbadduser.patch
Patch9: samba-glibc21.patch
Patch10: samba-2.2.0-capatibility.patch
Patch11: samba-2.2.0-logname.patch Patch11: samba-2.2.0-logname.patch
Patch13: samba-2.2.2-winsfixes.patch
Patch14: samba-2.2.3-smbadduserloc.patch
# Not used, but it have some patches which might be needed later...
Patch15: samba-2.2.2-smbadduser.patch
# japanese patches # japanese patches
Patch100: samba-j.patch.bz2 Patch100: samba-j.patch.bz2
Patch111: samba-2.2.0-ook.patch Patch111: samba-2.2.0-ook.patch
Patch200: samba-j-2.patch.bz2 Patch200: samba-j-2.patch.bz2
# s390 patches
Patch300: samba-2.2.1a-s390.patch
Requires: pam >= 0.64 %{auth} samba-common = %{version} Requires: pam >= 0.64 %{auth} samba-common = %{version}
Requires: logrotate >= 3.4 initscripts >= 5.54-1 Requires: logrotate >= 3.4 initscripts >= 5.54-1
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
Prereq: fileutils sed /etc/init.d Prereq: fileutils sed /etc/init.d
BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils
Exclusivearch: i386
%description %description
Samba is the protocol by which a lot of PC-related machines share Samba is the protocol by which a lot of PC-related machines share
@ -95,25 +92,19 @@ Web browser.
cp %{SOURCE5} packaging/RedHat/ cp %{SOURCE5} packaging/RedHat/
cp %{SOURCE6} packaging/RedHat/ cp %{SOURCE6} packaging/RedHat/
cp %{SOURCE7} packaging/RedHat/ cp %{SOURCE7} packaging/RedHat/
cp %{SOURCE8} packaging/RedHat/winbind.init
%patch0 -p1 -b .oldconf %patch0 -p1 -b .oldconf
%patch1 -p1 -b .smbw %patch1 -p1 -b .smbw
%patch3 -p1 -b .gawk %patch3 -p1 -b .gawk
%patch4 -p1 -b .ia64
%patch5 -p1 -b .krb5-1.2 %patch5 -p1 -b .krb5-1.2
%patch6 -p1 -b .buildroot %patch6 -p1 -b .buildroot
%patch7 -p1 -b .quota %patch13 -p1 -b .winsfixes
%patch8 -p1 -b .locationfix %patch14 -p1 -b .locfix
%patch9 -p1 -b .glibc
%patch10 -p1 -b .compilefix
### %patch100 -p1 -b .j ### patch100 -p1 -b .j
%patch111 -p1 -b .ook ### patch111 -p1 -b .ook
### %patch200 -p1 -b .j-2 ### patch200 -p1 -b .j-2
%ifarch s390 s390x
%patch300 -p1 -b .s390
%endif
%build %build
@ -135,7 +126,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
--with-pam_smbpass \ --with-pam_smbpass \
--with-mmap \ --with-mmap \
--with-quotas \ --with-quotas \
--without-smbwrapper --without-smbwrapper \
--with-utmp
make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
all smbfilter nsswitch/libnss_wins.so debug2html all smbfilter nsswitch/libnss_wins.so debug2html
@ -176,16 +168,31 @@ install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir} install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir} install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m755 source/smbadduser $RPM_BUILD_ROOT%{_bindir} install -m755 source/script/smbadduser $RPM_BUILD_ROOT%{_bindir}
install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{_bindir} install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{_bindir}
install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{initdir}/smb install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{initdir}/smb
install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
install -m644 $RPM_SOURCE_DIR/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba install -m644 $RPM_SOURCE_DIR/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
# pam_smbpass
mkdir -p $RPM_BUILD_ROOT/lib/security
mv $RPM_BUILD_ROOT%{_bindir}/pam_smbpass.so $RPM_BUILD_ROOT/lib/security/pam_smbpass.so
cp -r source/pam_smbpass/ docs/
rm -f docs/pam_smbpass/*.*
# winbind
install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security/pam_winbind.so
mkdir -p $RPM_BUILD_ROOT/lib
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so
install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so
ln -s libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2
ln -s libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so.2
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
@ -242,9 +249,12 @@ fi
%doc WHATSNEW.txt Roadmap %doc WHATSNEW.txt Roadmap
%doc docs %doc docs
%doc examples %doc examples
%attr(755,root,root) /lib/security/pam_smbpass.so
%{_sbindir}/smbd %{_sbindir}/smbd
%{_sbindir}/nmbd %{_sbindir}/nmbd
%{_bindir}/make_unicodemap
%{_bindir}/mksmbpasswd.sh %{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus %{_bindir}/smbstatus
%{_bindir}/smbadduser %{_bindir}/smbadduser
%config(noreplace) %{_sysconfdir}/sysconfig/samba %config(noreplace) %{_sysconfdir}/sysconfig/samba
@ -252,6 +262,8 @@ fi
%attr(755,root,root) %config %{initdir}/smb %attr(755,root,root) %config %{initdir}/smb
%config(noreplace) %{_sysconfdir}/logrotate.d/samba %config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba %config(noreplace) %{_sysconfdir}/pam.d/samba
%{_mandir}/man1/make_unicodemap.1*
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1* %{_mandir}/man1/smbstatus.1*
%{_mandir}/man5/smbpasswd.5* %{_mandir}/man5/smbpasswd.5*
%{_mandir}/man7/samba.7* %{_mandir}/man7/samba.7*
@ -280,6 +292,8 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
/sbin/mount.smb /sbin/mount.smb
/sbin/mount.smbfs /sbin/mount.smbfs
%{_bindir}/rpcclient
%{_bindir}/smbcacls
%{_bindir}/smbmount %{_bindir}/smbmount
%{_bindir}/smbmnt %{_bindir}/smbmnt
%{_bindir}/smbumount %{_bindir}/smbumount
@ -293,6 +307,9 @@ fi
%{_bindir}/smbprint %{_bindir}/smbprint
%{_bindir}/smbspool %{_bindir}/smbspool
%{_bindir}/smbtar %{_bindir}/smbtar
%{_mandir}/man1/findsmb.1*
%{_mandir}/man1/rpcclient.1*
%{_mandir}/man1/smbcacls.1*
%{_mandir}/man1/smbtar.1* %{_mandir}/man1/smbtar.1*
%{_mandir}/man1/smbclient.1* %{_mandir}/man1/smbclient.1*
%{_mandir}/man1/nmblookup.1* %{_mandir}/man1/nmblookup.1*
@ -302,16 +319,24 @@ fi
%files common %files common
%defattr(-,root,root) %defattr(-,root,root)
/lib/libnss_wins.so
/lib/libnss_wins.so.2
/lib/libnss_winbind.so
/lib/libnss_winbind.so.2
/lib/security/pam_winbind.so
%{_bindir}/make_smbcodepage %{_bindir}/make_smbcodepage
%{_bindir}/testparm %{_bindir}/testparm
%{_bindir}/testprns %{_bindir}/testprns
%{_bindir}/smbpasswd %{_bindir}/smbpasswd
%{_bindir}/make_printerdef %{_bindir}/make_printerdef
%{_bindir}/wbinfo
%{_sbindir}/winbindd
%config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/smb.conf
%config(noreplace) %{_sysconfdir}/samba/lmhosts %config(noreplace) %{_sysconfdir}/samba/lmhosts
%dir %{_datadir}/samba %dir %{_datadir}/samba
%dir %{_datadir}/samba/codepages %dir %{_datadir}/samba/codepages
%dir %{_sysconfdir}/samba %dir %{_sysconfdir}/samba
%{initdir}/winbind
%{_datadir}/samba/codepages/* %{_datadir}/samba/codepages/*
%{_mandir}/man1/make_smbcodepage.1* %{_mandir}/man1/make_smbcodepage.1*
%{_mandir}/man1/testparm.1* %{_mandir}/man1/testparm.1*
@ -319,6 +344,8 @@ fi
%{_mandir}/man5/smb.conf.5* %{_mandir}/man5/smb.conf.5*
%{_mandir}/man5/lmhosts.5* %{_mandir}/man5/lmhosts.5*
%{_mandir}/man8/smbpasswd.8* %{_mandir}/man8/smbpasswd.8*
%{_mandir}/man1/wbinfo.1*
%{_mandir}/man8/winbindd.8*
#%{_mandir}/ja/man1/make_smbcodepage.1* #%{_mandir}/ja/man1/make_smbcodepage.1*
#%{_mandir}/ja/man1/testparm.1* #%{_mandir}/ja/man1/testparm.1*
#%{_mandir}/ja/man1/testprns.1* #%{_mandir}/ja/man1/testprns.1*
@ -327,11 +354,48 @@ fi
#%{_mandir}/ja/man8/smbpasswd.8* #%{_mandir}/ja/man8/smbpasswd.8*
%changelog %changelog
* Wed Mar 12 2003 D. Marlin <dmarlin@redhat.com> 2.2.1a-5s.1 * Thu Feb 7 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-0.72
- new version number and rebuild for s390 (bug #85960) - 2.2.3a
* Tue Nov 6 2001 Than Ngo <than@redhat.com> 2.2.1a-5 * Mon Feb 4 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3-1
- workaround for non-broadcast interface on s390 (bug #55421) - 2.2.3
* Thu Nov 29 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-8
- New pam configuration file for samba
* Tue Nov 27 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-7
- Enable PAM session controll and password sync
* Tue Nov 13 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-6
- Move winbind files to samba-common. Add separate initscript for
winbind
- Fixes for winbind - protect global variables with mutex, use
more secure getenv
* Thu Nov 8 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-5
- Teach smbadduser about "getent passwd"
- Fix more pid-file references
- Add (conditional) winbindd startup to the initscript, configured in
/etc/sysconfig/samba
* Wed Nov 7 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-4
- Fix pid-file reference in logrotate script
- include pam and nss modules for winbind
* Mon Nov 5 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-3
- Add "--with-utmp" to configure options (#55372)
- Include winbind, pam_smbpass.so, rpcclient and smbcacls
- start using /var/cache/samba, we need to keep state and there is
more than just locks involved
* Sat Nov 03 2001 Florian La Roche <Florian.LaRoche@redhat.de> 2.2.2-2
- add "reload" to the usage string in the startup script
* Mon Oct 15 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-1
- 2.2.2
* Tue Sep 18 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.1a-5
- Add patch from Jeremy Allison to fix IA64 alignment problems (#51497)
* Mon Aug 13 2001 Trond Eivind Glomsrød <teg@redhat.com> * Mon Aug 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
- Don't include smbpasswd in samba, it's in samba-common (#51598) - Don't include smbpasswd in samba, it's in samba-common (#51598)

View File

@ -2,3 +2,5 @@
SMBDOPTIONS="-D" SMBDOPTIONS="-D"
# Options to nmbd # Options to nmbd
NMBDOPTIONS="-D" NMBDOPTIONS="-D"
# Options for winbindd
WINBINDOPTIONS=""

View File

@ -4,8 +4,8 @@
# description: Starts and stops the Samba smbd and nmbd daemons \ # description: Starts and stops the Samba smbd and nmbd daemons \
# used to provide SMB network services. # used to provide SMB network services.
# #
# pidfile: /var/lock/samba/smbd.pid # pidfile: /var/cache/samba/smbd.pid
# pidfile: /var/lock/samba/nmbd.pid # pidfile: /var/cache/samba/nmbd.pid
# config: /etc/samba/smb.conf # config: /etc/samba/smb.conf
@ -106,7 +106,7 @@ case "$1" in
[ -f /var/lock/subsys/smb ] && restart || : [ -f /var/lock/subsys/smb ] && restart || :
;; ;;
*) *)
echo $"Usage: $0 {start|stop|restart|status|condrestart}" echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
exit 1 exit 1
esac esac

View File

@ -1,3 +1,3 @@
ddc96f217e3995a1b93e477a2dc02240 samba-2.2.1a.tar.bz2 2622fdec0784ef9c5d0de2490405ae27 samba-2.2.3a.tar.bz2
78256a614669d18ffa69e3a829b747c8 samba-j-2.patch.bz2 78256a614669d18ffa69e3a829b747c8 samba-j-2.patch.bz2
1d32404898afadd0a0e3df3f80d80649 samba-j.patch.bz2 1d32404898afadd0a0e3df3f80d80649 samba-j.patch.bz2

100
winbind.init Normal file
View File

@ -0,0 +1,100 @@
#!/bin/sh
#
# chkconfig: - 91 35
# description: Starts and stops the Samba winbind daemon
# #
# pidfile: /var/cache/samba/winbind.pid
# config: /etc/samba/smb.conf
# Source function library.
if [ -f /etc/init.d/functions ] ; then
. /etc/init.d/functions
elif [ -f /etc/rc.d/init.d/functions ] ; then
. /etc/rc.d/init.d/functions
else
exit 0
fi
# Avoid using root's TMPDIR
unset TMPDIR
# Source networking configuration.
. /etc/sysconfig/network
if [ -f /etc/sysconfig/samba ]; then
. /etc/sysconfig/samba
fi
# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0
# Check that smb.conf exists.
[ -f /etc/samba/smb.conf ] || exit 0
RETVAL=0
start() {
KIND="Winbind"
echo -n $"Starting $KIND services: "
daemon winbindd "$WINBINDOPTIONS"
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbindd || RETVAL=1
return $RETVAL
}
stop() {
echo
KIND="Winbind"
echo -n $"Shutting down $KIND services: "
killproc winbindd
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd
echo ""
return $RETVAL
}
restart() {
stop
start
}
reload() {
echo -n $"Reloading smb.conf file: "
killproc winbindd -HUP
RETVAL=$?
echo
return $RETVAL
}
rhstatus() {
status winbindd
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
reload)
reload
;;
status)
rhstatus
;;
condrestart)
[ -f /var/lock/subsys/winbindd ] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
exit 1
esac
exit $?