[netatalk] Update to 3.1.3
Christopher Meng
cicku at fedoraproject.org
Sat Jul 5 03:41:36 UTC 2014
commit f6bbe96ceec5c44fc92909c882f9521be4a295ff
Author: Christopher Meng <i at cicku.me>
Date: Sat Jul 5 11:41:26 2014 +0800
Update to 3.1.3
.gitignore | 1 +
netatalk.spec | 377 +++++++++++++++++++++++++++++++++++++--------------------
sources | 2 +-
3 files changed, 247 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e61d96b..1b00f6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ netatalk-2.1.3.tar.bz2
/netatalk-2.2.1.tar.bz2
/netatalk-2.2.2.tar.bz2
/netatalk-2.2.3.tar.bz2
+/netatalk-3.1.3.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index 0b34b13..2a7e066 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,27 +1,112 @@
-Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh
-Name: netatalk
-Version: 2.2.3
-Release: 11%{?dist}
-Epoch: 4
-License: GPLv2+
-Group: System Environment/Daemons
-Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
-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.2.3-sigterm.patch
-Patch4: netatalk-2.2.3-libdb4.patch
-
-Url: http://netatalk.sourceforge.net/
-Requires: pam
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake
-BuildRequires: autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel
-BuildRequires: avahi-devel libacl-devel openldap-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global pkgver $(rpm -qls tracker-devel | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2)
+
+%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl)
+
+%global _hardened_build 1
+
+%global with_acls 1
+
+%global with_bdb 1
+
+%global with_cracklib 1
+
+%global with_docbook 1
+
+%global with_dtrace 1
+
+%global with_mysql 1
+
+%global with_mysql 1
+
+%global with_openafs 0
+
+%global with_quota 1
+
+%if 0%{?fedora} >= 15 || 0%{?el} >= 7
+%global with_systemd 1
+%else
+%global with_systemd 0
+%endif
+
+%global with_tcp_wrappers 1
+
+%global with_tracker 1
+
+Name: netatalk
+Epoch: 4
+Version: 3.1.3
+Release: 1%{?dist}
+Summary: Open Source Apple Filing Protocol(AFP) fileserver
+License: GPLv2+
+URL: http://netatalk.sourceforge.net/
+Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
+Source1: netatalk.pam-system-auth
+#Patch2: netatalk-2.0.4-extern_ucreator.patch
+BuildRequires: avahi-devel
+BuildRequires: bison
+%if 0%{?with_cracklib}
+BuildRequires: cracklib-devel
+%endif
+%if 0%{?with_dbus}
+BuildRequires: dbus-devel
+BuildRequires: dbus-glib-devel
+%endif
+%if 0%{?with_docbook}
+BuildRequires: docbook-style-xsl
+%endif
+BuildRequires: flex
+%if 0%{?with_acls}
+BuildRequires: libacl-devel
+%endif
+BuildRequires: libattr-devel
+%if 0%{?with_bdb}
+BuildRequires: libdb-devel
+%endif
+BuildRequires: libevent-devel
+BuildRequires: libgcrypt-devel
+%if 0%{?with_docbook}
+BuildRequires: libxslt
+%endif
+BuildRequires: krb5-devel
+%if 0%{?with_openafs}
+%if 0%{?with_mysql}
+BuildRequires: mysql-devel
+%endif
+BuildRequires: openafs-devel
+%endif
+%if 0%{?with_ldap}
+BuildRequires: openldap-devel
+%endif
+BuildRequires: openssl-devel
+BuildRequires: procps-ng
+BuildRequires: pam-devel
+%if 0%{?with_quota}
+BuildRequires: quota-devel
+%endif
+%if 0%{?with_systemd}
+BuildRequires: systemd
+%endif
+%if 0%{?with_dtrace}
+BuildRequires: systemtap-sdt-devel
+%endif
+%if 0%{?with_tcp_wrappers}
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: libtdb-devel
+%if 0%{?with_tracker}
+BuildRequires: tracker-devel
+%endif
+Requires: dbus-python
+%if 0%{?with_systemd}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+%endif
%description
Netatalk is a freely-available Open Source AFP fileserver. It also provides a
@@ -31,140 +116,139 @@ 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
-Group: Development/Libraries
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-%description devel
-This package contains the header files for building Appletalk networking
-programs.
+%description devel
+This package contains libraries and header files for
+developing applications that use %{name}.
%prep
%setup -q
-
-%patch1 -p1 -b .uams_no_pie
-%patch2 -p1 -b .extern_ucreator
-%patch3 -p1 -b .sigterm
-%patch4 -p1 -b .libdb4
-
-ln -s ./NEWS ChangeLog
+rm -frv libevent/
+#patch2 -p1 -b .extern_ucreator
%build
-touch AUTHORS
-libtoolize --force
-aclocal -I macros
-automake --add-missing
-autoconf
-autoheader
-export CFLAGS="$RPM_OPT_FLAGS"
-%ifnarch x86_64
-# XXX : enable for x86_64 when glibc bug 149284 is fixed!
-export CFLAGS="$CFLAGS -fPIE"
-export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen"
-%endif
%ifarch ppc ppc64 s390 s390x
export CFLAGS="$CFLAGS -fsigned-char"
%endif
%configure \
- --with-pkgconfdir=/etc/netatalk/ \
- --with-cracklib \
- --with-pam \
- --with-shadow \
- --with-uams-path=%{_libdir}/atalk \
- --enable-shared \
- --enable-krbV-uam \
- --enable-overwrite \
- --with-gnu-ld \
- --enable-redhat-systemd \
- --with-libgcrypt
-
-# Grrrr. Fix broken libtool/autoFOO Makefiles.
-if [ "%{_lib}" != lib ]; then
- find . -name Makefile | xargs perl -pi \
- -e 's,-L/usr/lib,-L%{_libdir},g'
- find . -name Makefile | xargs perl -pi \
- -e 's,-L/lib,-L/%{_lib},g'
-fi
-
-make %{?_smp_mflags} all
+%if 0%{?with_acls}
+ --with-acl \
+%endif
+%if 0%{?with_cracklib}
+ --with-cracklib \
+%endif
+%if 0%{?with_docbook}
+ --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver} \
+%endif
+ --with-kerberos \
+ --with-libgcrypt \
+ --with-pam \
+ --with-pkgconfdir=%{_sysconfdir}/netatalk/ \
+ --with-shadow \
+ --with-spotlight \
+ --with-tbd=no \
+ --with-uams-path=%{_libdir}/atalk \
+ --enable-pgp-uam \
+ --enable-shared \
+ --enable-krbV-uam \
+ --enable-overwrite \
+%if 0%{?with_systemd}
+ --with-init-style=redhat-systemd \
+%else
+ --with-init-style=redhat-sysv \
+%endif
+%if 0%{?with_tracker}
+ --with-tracker-pkgconfig-version=%{pkgver} \
+%endif
+ --without-libevent \
+ --without-tdb \
+ --with-bdb \
+ --with-libevent-header=%{_includedir} \
+ --with-libevent-lib=%{_libdir} \
+ --disable-silent-rules \
+ --disable-static
+
+%make_build
+# Build the local docs.
+make -C doc/manual html-local
%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-
-# install example config files in doc
-mkdir config.example
-cp -fp config/afpd.conf config.example
-cp -fp config/AppleVolumes.system config.example
-cp -fp config/AppleVolumes.default config.example
-cp -fp config/atalkd.conf config.example
-cp -fp config/atalkd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
-cp -fp config/netatalk.conf config.example
-cp -fp config/papd.conf config.example
-cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
-mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk
-cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk
-
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/netatalk
-
-# XXX bad hack until this file is updated in glibc-headers:
-rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
-
-# Clean up .a and .la files
-find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
-find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
+# Ghost lock dir.
+mkdir -p %{buildroot}%{_localstatedir}/lock/netatalk
+# Use specific pam conf.
+install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk
+
+find %{buildroot} -name '*.la' -delete -print
+
+%check
+sh test/afpd/test.sh
%post
+%if 0%{?with_systemd}
%systemd_post netatalk.service
+%else
+chkconfig --add netatalk
+%endif
%preun
+%if 0%{?with_systemd}
%systemd_preun netatalk.service
+%else
+if [ $1 -eq 0 ] ; then
+ service netatalk stop &> /dev/null
+ chkconfig --del netatalk &> /dev/null
+%endif
%postun
+%if 0%{?with_systemd}
%systemd_postun_with_restart netatalk.service
+%else
+if [ "$1" -ge "1" ] ; then
+ service netatalk condrestart >/dev/null 2>&1 || :
+fi
+%endif
%files
-%defattr(-,root,root)
-%doc COPYRIGHT COPYING ChangeLog VERSION NEWS
-%doc doc
-%doc config.example
+%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS
+%doc doc/manual/*.html
+%config %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf
%dir %{_sysconfdir}/netatalk
-/lib/systemd/system/netatalk.service
-/usr/libexec/netatalk/netatalk.sh
-%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}/netatalk/afp_ldap.conf
+%config(noreplace) %{_sysconfdir}/netatalk/afp.conf
+%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf
+%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf
%config(noreplace) %{_sysconfdir}/pam.d/netatalk
-%{_sbindir}/*
%{_bindir}/*
%exclude %{_bindir}/netatalk-config
+%{_libdir}/atalk/
+%{_libdir}/libatalk.so.*
%{_mandir}/man*/*
%exclude %{_mandir}/man*/netatalk-config*
-%{_datadir}/netatalk
-%dir %{_libdir}/atalk
-%{_libdir}/atalk/*.so
+%{_sbindir}/*
+%if 0%{?with_systemd}
+%{_unitdir}/netatalk.service
+%else
+%{_initrddir}/netatalk
+%endif
+%ghost %dir %{_localstatedir}/lock/netatalk
+%{_localstatedir}/netatalk/
%files devel
-%defattr(-,root,root)
%doc COPYRIGHT COPYING
-%dir %{_includedir}/atalk
-%dir %{_includedir}/netatalk
-%attr(0644,root,root) %{_includedir}/atalk/*
-%attr(0644,root,root) %{_includedir}/netatalk/*
-%{_datadir}/aclocal/netatalk.m4
%{_bindir}/netatalk-config
+%{_datadir}/aclocal/netatalk.m4
+%{_includedir}/atalk/
+%{_libdir}/libatalk.so
%{_mandir}/man*/netatalk-config.1*
%changelog
+* Fri Jul 04 2014 Christopher Meng <rpm at cicku.me> - 4:3.1.3-1
+- Update to 3.1.3
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:2.2.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -332,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jan 23 2007 Jindrich Novy <jnovy at redhat.com> - 4:2.0.3-9
- rebuild against new db4
-* Mon Dec 04 2006 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-8
+* Mon Dec 04 2006 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-8
- BuildRequires changed from cracklib to cracklib-devel
* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-7
@@ -402,7 +486,7 @@ rm -rf $RPM_BUILD_ROOT
- Make multilib generic
- Add builddep on quota (for rpcsvc/rquota.h)
-* Wed Feb 18 2003 Bill Nottingham <notting at redhat.com> 1.5.5-5
+* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1.5.5-5
- fix initscript error (#82118)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
@@ -410,7 +494,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jan 7 2003 Nalin Dahyabhai <nalin at redhat.com> 1.5.5-3
- patch for compile errors with new ssl libs
-- rebuild
+- rebuildfedora
* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- postun should never fail
@@ -515,9 +599,9 @@ rm -rf $RPM_BUILD_ROOT
* Thu Dec 16 1999 Tim Powers <timp at redhat.com>
- renewed source so it is pristine, delete the problematic files in spec file
- instead
+ instead
- general spec file cleanups, create buildroot and dirs in the %%install
- section
+ section
- strip binaries
- gzip man pages
- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too
@@ -527,84 +611,113 @@ rm -rf $RPM_BUILD_ROOT
* Tue Aug 3 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- rpm-3.0 needs to remove vogus files from source.
Removed files: etc/papd/.#magics.c, etc/.#diff
+
* Fri Jul 30 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- Change Copyright tag to BSD.
Add /usr/bin/adv1tov2.
+
* Thu Apr 22 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- Correct librpcsvc.patch. Move %%changelog section last.
Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since
LinuxPPC may need.
+
* Wed Mar 31 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile.
+
* Sat Mar 20 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- Correct symbolic links to psf.
+
Remove asciize function from nbplkup so as to display Japanese hostname.
* Thu Mar 11 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+
- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping
containd in Internet Config Preference.
+
* Tue Mar 2 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- [asun2.1.3]
+
* Mon Feb 15 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- [pre-asun2.1.2-8]
+
* Sun Feb 7 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
- [pre-asun2.1.2-6]
+
* Mon Jan 25 1999 iNOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- [pre-asun2.1.2-3]
+
* Thu Dec 17 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- [pre-asun2.1.2]
Remove crlf patch. It is now a server's option.
+
* Thu Dec 3 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz
Add uams directory
+
* Sat Nov 28 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.1-3 source.
+
* Mon Nov 23 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.1-2 source.
+
* Mon Nov 16 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Fix rcX.d's symbolic links.
+
* Wed Oct 28 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line.
+
* Sat Oct 24 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz.
+
* Mon Oct 5 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0-10a source.
-* Thu Sep 19 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+
+* Sat Sep 19 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0-8 source. Add chkconfig support.
+
* Sat Sep 12 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Comment out -DCRLF. Use RPM_OPT_FLAGS.
-* Mon Sep 8 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+
+* Tue Sep 8 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk.
-* Mon Aug 22 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+
+* Sat Aug 22 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0-6 source.
+
* Mon Jul 27 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use pre-asun2.1.0-5 source.
+
* Tue Jul 21 1998 INOUE Koichi <inoue at ma.ns.musashi-techa.c.jp>
- Use pre-asun2.1.0-3 source.
+
* Tue Jul 7 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Add afpovertcp entries to /etc/services
- Remove BuildRoot in man8 pages
+
* Mon Jun 29 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun
<asun at saul9.u.washington.edu> to provide an AppleShareIP file server
+
- Included AppleVolumes.system file maintained by Johnson
<johnson at stpt.usf.edu>
+
* Mon Aug 25 1997 David Gibson <D.Gibson at student.anu.edu.au>
- Used a buildroot
- Use RPM_OPT_FLAGS
- Moved configuration parameters/files from atalk.init to /etc/atalk
- Separated devel package
- Built with shared libraries
+
* Sun Jul 13 1997 Paul H. Hargrove <hargrove at sccm.Stanford.EDU>
- Updated sources from 1.3.3 to 1.4b2
- Included endian patch for Linux/SPARC
- Use all the configuration files supplied in the source. This has the
following advantages over the ones in the previous rpm release:
- + The printer 'lp' isn't automatically placed in papd.conf
- + The default file conversion is binary rather than text.
+ + The printer 'lp' isn't automatically placed in papd.conf
+ + The default file conversion is binary rather than text.
- Automatically add and remove DDP services from /etc/services
- Placed the recommended /etc/services in the documentation
- Changed atalk.init to give daemons a soft kill
- Changed atalk.init to make configuration easier
* Wed May 28 1997 Mark Cornick <mcornick at zorak.gsfc.nasa.gov>
-Updated for /etc/pam.d
+- Updated for /etc/pam.d
diff --git a/sources b/sources
index acc09ac..4844848 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b5a0645836183b0e548ccfbd5c022f8 netatalk-2.2.3.tar.bz2
+ac65dafa20d502a10438fec7e1116b1e netatalk-3.1.3.tar.bz2
More information about the scm-commits
mailing list