rpms/netatalk/devel netatalk-2.1-initscript.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 netatalk.spec, 1.60, 1.61 sources, 1.10, 1.11 netatalk-2.1-mkfile.patch, 1.1, NONE
Jiri Skala
jskala at fedoraproject.org
Fri May 28 08:06:07 UTC 2010
Author: jskala
Update of /cvs/extras/rpms/netatalk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5778
Modified Files:
.cvsignore netatalk.spec sources
Added Files:
netatalk-2.1-initscript.patch
Removed Files:
netatalk-2.1-mkfile.patch
Log Message:
* Fri May 28 2010 Jiri Skala <jskala at redhat.com> - 4:2.1.1-1
- updated to latest upstream version
- fixes #594999 - Summary and Description are old-fashioned
- renamed initscript
- initscript modified to be POSIX compliant
netatalk-2.1-initscript.patch:
Makefile.am | 2 +-
rc.atalk.redhat.tmpl | 46 ++++++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 23 deletions(-)
--- NEW FILE netatalk-2.1-initscript.patch ---
diff -up netatalk-2.1/distrib/initscripts/Makefile.am.initscript netatalk-2.1/distrib/initscripts/Makefile.am
--- netatalk-2.1/distrib/initscripts/Makefile.am.initscript 2010-04-19 13:35:26.000000000 +0200
+++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-25 14:20:23.111718639 +0200
@@ -58,7 +58,7 @@ uninstall: uninstall-startup
if USE_REDHAT
sysvdir = /etc/rc.d/init.d
-sysv_SCRIPTS = atalk
+sysv_SCRIPTS = netatalk
$(sysv_SCRIPTS): rc.atalk.redhat
cp -f rc.atalk.redhat $(sysv_SCRIPTS)
diff -up netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl
--- netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript 2010-04-19 13:35:26.000000000 +0200
+++ netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl 2010-05-25 15:14:58.613715823 +0200
@@ -19,27 +19,9 @@ ATALK_SBIN=:SBINDIR:
# Source networking configuration.
. /etc/sysconfig/network
-if [ ! -x ${ATALK_SBIN}/atalkd ]; then
- # Quickly probe for appletalk and warn if we can't find it
- #/sbin/modprobe appletalk || echo "[could not load appletalk module]"
- # Check for IP Encapsulation support
- #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]"
- echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]";
- exit 0;
-fi
-
-if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
- echo "[${ATALK_CONF_DIR}/netatalk.conf not found]";
- exit 0;
-fi
-
# read in netatalk configuration
-. ${ATALK_CONF_DIR}/netatalk.conf
-
-# Check that networking is up.
-if [ ${NETWORKING} = "no" ]; then
- echo "[Network isn't started]";
- exit 0;
+if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
+ . ${ATALK_CONF_DIR}/netatalk.conf
fi
# initialize return values
@@ -51,6 +33,26 @@ RETVAL_AFPD=0
# startup code for everything
atalk_startup() {
+ # Check that networking is up.
+ if [ ${NETWORKING} = "no" ]; then
+ echo "[Network isn't started]";
+ exit 1;
+ fi
+
+ if [ ! -x ${ATALK_SBIN}/atalkd ]; then
+ # Quickly probe for appletalk and warn if we can't find it
+ #/sbin/modprobe appletalk || echo "[could not load appletalk module]"
+ # Check for IP Encapsulation support
+ #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]"
+ echo "[${ATALK_SBIN}/atalkd not found. Check for permissions]";
+ exit 4;
+ fi
+
+ if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
+ echo "[${ATALK_CONF_DIR}/netatalk.conf not found]";
+ exit 6;
+ fi
+
if [ x"${ATALKD_RUN}" != x"no" ]; then
echo -n " Starting atalkd:"
daemon ${ATALK_SBIN}/atalkd
@@ -218,8 +220,8 @@ case "$1" in
RETVAL=$?
;;
*)
- echo "Usage: atalk {start|stop|restart|status}"
- exit 1
+ echo "Usage: $0 {start|stop|restart|reload|status}"
+ exit 2
esac
exit $RETVAL
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 14 May 2010 11:53:37 -0000 1.10
+++ .cvsignore 28 May 2010 08:06:04 -0000 1.11
@@ -1 +1 @@
-netatalk-2.1.tar.bz2
+netatalk-2.1.1.tar.bz2
Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- netatalk.spec 14 May 2010 11:51:12 -0000 1.60
+++ netatalk.spec 28 May 2010 08:06:06 -0000 1.61
@@ -1,17 +1,16 @@
-Summary: AppleTalk networking programs
+Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh
Name: netatalk
-Version: 2.1
+Version: 2.1.1
Release: 1%{?dist}
Epoch: 4
License: GPLv2+
Group: System Environment/Daemons
Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
-# Source1: atalk.init
Source2: netatalk.pam-system-auth
Patch1: netatalk-2.0.2-uams_no_pie.patch
Patch2: netatalk-2.0.4-extern_ucreator.patch
-Patch3: netatalk-2.1-mkfile.patch
+Patch3: netatalk-2.1-initscript.patch
Url: http://netatalk.sourceforge.net/
Requires: pam
@@ -23,9 +22,12 @@ BuildRequires: cracklib-devel openssl-de
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
-This package enables Linux to talk to Macintosh computers via the
-AppleTalk networking protocol. It includes a daemon to allow Linux
-to act as a file server over EtherTalk or IP for Mac's.
+Netatalk is a freely-available Open Source AFP fileserver. It also provides a
+kernel level implementation of the AppleTalk Protocol Suite. A *NIX/*BSD system
+running Netatalk is capable of serving many Macintosh clients simultaneously
+as an AppleShare file server (AFP), AppleTalk router, *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP). Included
+are a number of minor printing and debugging utilities.
%package devel
Summary: Headers for Appletalk development
@@ -40,7 +42,7 @@ programs.
%patch1 -p1 -b .uams_no_pie
%patch2 -p1 -b .extern_ucreator
-%patch3 -p1 -b .mkfile
+%patch3 -p1 -b .initscript
ln -s ./NEWS ChangeLog
@@ -60,8 +62,9 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now
%ifarch ppc ppc64 s390 s390x
export CFLAGS="$CFLAGS -fsigned-char"
%endif
+
%configure \
- --with-pkgconfdir=/etc/atalk/ \
+ --with-pkgconfdir=/etc/netatalk/ \
--with-cracklib \
--with-pam \
--with-shadow \
@@ -85,26 +88,7 @@ make %{?_smp_mflags} all
%install
rm -rf $RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-#mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
-
make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-#
-# netatalk now installs its own config files, which are more
-# appropriate for v2.0 than the ones we used to ship.
-#
-#install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default
-#install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf
-#install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf
-#install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf
-#install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk
-#
-# Use netatalk's redhat initscript
-#
-#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk
-#cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
-#cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
# install example config files in doc
mkdir config.example
@@ -131,18 +115,21 @@ find $RPM_BUILD_ROOT -name \*.la -exec r
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/chkconfig --add atalk
+/sbin/chkconfig --add netatalk
/sbin/ldconfig
%preun
if [ "$1" = "0" ] ; then
- /sbin/service atalk stop > /dev/null 2>&1
- /sbin/chkconfig --del atalk
+ # check for existence due to renaming initscritp
+ if [ -x %{_initrddir}/netatalk ] ; then
+ /sbin/service netatalk stop > /dev/null 2>&1
+ /sbin/chkconfig --del netatalk
+ fi
fi
%postun
if [ "$1" -ge "1" ]; then
- /sbin/service atalk condrestart > /dev/null 2>&1 || :
+ /sbin/service netatalk condrestart > /dev/null 2>&1 || :
fi
/sbin/ldconfig
@@ -150,17 +137,16 @@ fi
%defattr(-,root,root)
%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS
%doc ICDumpSuffixMap doc
-# %doc bin/afile/acleandir.rc
%doc config.example
-%dir /etc/atalk
-%attr(755,root,root) %{_initrddir}/atalk
-%config(noreplace) /etc/atalk/AppleVolumes.default
-%config(noreplace) /etc/atalk/AppleVolumes.system
-%config(noreplace) /etc/atalk/netatalk.conf
-%config(noreplace) /etc/atalk/afpd.conf
-%config(noreplace) /etc/atalk/atalkd.conf
-%config(noreplace) /etc/atalk/papd.conf
-%config(noreplace) /etc/pam.d/netatalk
+%dir %{_sysconfdir}/netatalk
+%attr(755,root,root) %{_initrddir}/netatalk
+%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.default
+%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.system
+%config(noreplace) %{_sysconfdir}/netatalk/netatalk.conf
+%config(noreplace) %{_sysconfdir}/netatalk/afpd.conf
+%config(noreplace) %{_sysconfdir}/netatalk/atalkd.conf
+%config(noreplace) %{_sysconfdir}/netatalk/papd.conf
+%config(noreplace) %{_sysconfdir}/pam.d/netatalk
%{_sbindir}/*
%{_bindir}/*
%exclude %{_bindir}/netatalk-config
@@ -182,6 +168,12 @@ fi
%{_mandir}/man*/netatalk-config.1*
%changelog
+* Fri May 28 2010 Jiri Skala <jskala at redhat.com> - 4:2.1.1-1
+- updated to latest upstream version
+- fixes #594999 - Summary and Description are old-fashioned
+- renamed initscript
+- initscript modified to be POSIX compliant
+
* Wed May 12 2010 Jiri Skala <jskala at redhat.com> - 4:2.1-1
- updated to latest upstream version
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 14 May 2010 11:53:37 -0000 1.10
+++ sources 28 May 2010 08:06:06 -0000 1.11
@@ -1 +1 @@
-b780f98a8764daab45d288579320a8a0 netatalk-2.1.tar.bz2
+d91913958970b4bcd72577aa52aa31be netatalk-2.1.1.tar.bz2
--- netatalk-2.1-mkfile.patch DELETED ---
More information about the scm-commits
mailing list