The package rpms/netatalk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=81611ededd7b... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=ec9b0d142769... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=aeac6e0b1a25... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=69ac297e5b2b... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=b32e39fb3633... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=c036a8ff40ce... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=f6bbe96ceec5... https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=e3e403eaa35d....
Change: -%ifarch ppc ppc64 s390 s390x +%ifarch ppc ppc64 s390 s390x +%ifarch x86_64 +%ifarch ppc ppc64 s390 s390x +%ifnarch x86_64 -%ifarch x86_64 -%ifnarch x86_64 -%ifarch ppc ppc64 s390 s390x
Thanks.
Full change: ============
commit 9b286a9cb91421e9ed4aebe201f2eaacdf5aef9d Author: Andrew Bauer zonexpertconsulting@outlook.com Date: Sun Mar 10 19:54:46 2019 -0500
use python2 binary for el7 compat, use python3 binary everywhere else
diff --git a/netatalk.conf b/netatalk.conf index 2a4f83b..715cfee 100644 --- a/netatalk.conf +++ b/netatalk.conf @@ -1 +1 @@ -D /var/run/lock/netatalk 755 root root +D /run/lock/netatalk 755 root root diff --git a/netatalk.spec b/netatalk.spec index a31bea7..fa6e2a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -26,10 +26,17 @@ %global ldconfig /sbin/ldconfig %endif
+# set path to python binary per fedora packaging guidelines +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global python_bin /usr/bin/python3 +%else +%global python_bin /usr/bin/python2 +%endif + Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Source Apple Filing Protocol(AFP) File Server License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT # Project is also mirrored at https://github.com/Netatalk/Netatalk @@ -161,13 +168,8 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf
find %{buildroot} -name '*.la' -delete -print - # Fix python shebang -%if 0%{?fedora} || 0%{?rhel} >= 8 -sed -i 's^#!/usr/bin/env python$#!/usr/bin/python3' %{buildroot}/usr/bin/afpstats -%else -sed -i 's^#!/usr/bin/env python$#!/usr/bin/python' %{buildroot}/usr/bin/afpstats -%endif +sed -i 's^#!/usr/bin/env python$#!%{python_bin}' %{buildroot}/usr/bin/afpstats
%check sh test/afpd/test.sh @@ -211,6 +213,9 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1*
%changelog +* Sun Mar 10 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-4 +- use python2 binary for el7 compat, use python3 binary everywhere else + * Sun Mar 03 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-3 - execstartpre instead of runtimedirectory in service file for el7 compat
commit a515c3081f31b75a0f9fea61992c97a9f9b127ab Author: Jeroen van Meeuwen (Kolab Systems) vanmeeuwen@kolabsys.com Date: Sun Mar 10 18:44:39 2019 +0100
Fix typo
diff --git a/netatalk.spec b/netatalk.spec index c5c18e3..a31bea7 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -163,7 +163,7 @@ install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf find %{buildroot} -name '*.la' -delete -print
# Fix python shebang -%if 0%{%?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 8 sed -i 's^#!/usr/bin/env python$#!/usr/bin/python3' %{buildroot}/usr/bin/afpstats %else sed -i 's^#!/usr/bin/env python$#!/usr/bin/python' %{buildroot}/usr/bin/afpstats
commit 9e48c206af16009087a65239ffeb92edbad70a2a Author: Jeroen van Meeuwen (Kolab Systems) vanmeeuwen@kolabsys.com Date: Sun Mar 10 18:41:05 2019 +0100
EPEL 7 Python 3.6 change compat, and EPEL 8 compat
diff --git a/netatalk.spec b/netatalk.spec index e6af55a..c5c18e3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -161,8 +161,13 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf
find %{buildroot} -name '*.la' -delete -print + # Fix python shebang +%if 0%{%?fedora} || 0%{?rhel} >= 8 sed -i 's^#!/usr/bin/env python$#!/usr/bin/python3' %{buildroot}/usr/bin/afpstats +%else +sed -i 's^#!/usr/bin/env python$#!/usr/bin/python' %{buildroot}/usr/bin/afpstats +%endif
%check sh test/afpd/test.sh
commit 54fc3e1240b71fe4c8c0f65505c63e5389f1058a Author: Andrew Bauer zonexpertconsulting@outlook.com Date: Sun Mar 3 16:08:15 2019 -0600
execstartpre instead of runtimedirectory in service file for el7 compat
diff --git a/netatalk-systemd-execstartpre.patch b/netatalk-systemd-execstartpre.patch new file mode 100644 index 0000000..e88acea --- /dev/null +++ b/netatalk-systemd-execstartpre.patch @@ -0,0 +1,21 @@ +From e3cfccda2f8f12b7e173d007f43698038c4a2cfa Mon Sep 17 00:00:00 2001 +From: Andrew Bauer knnniggett@hotmail.com +Date: Sun, 3 Mar 2019 15:05:12 -0600 +Subject: [PATCH] use execstartpre to create netatalk tmpfile config + +--- + distrib/initscripts/service.systemd.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl +index 670f1445..76f38b22 100644 +--- a/distrib/initscripts/service.systemd.tmpl ++++ b/distrib/initscripts/service.systemd.tmpl +@@ -9,6 +9,7 @@ After=syslog.target network.target avahi-daemon.service + [Service] + Type=forking + GuessMainPID=no ++ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/netatalk.conf + ExecStart=:SBINDIR:/netatalk + PIDFile=:PATH_NETATALK_LOCK: + ExecReload=/bin/kill -HUP $MAINPID diff --git a/netatalk-systemd-runtimedirectory.patch b/netatalk-systemd-runtimedirectory.patch deleted file mode 100644 index 57fb3d6..0000000 --- a/netatalk-systemd-runtimedirectory.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 49c003d821dbe179a58dbd8abe5716de01b76d21 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer zonexpertconsulting@outlook.com -Date: Thu, 6 Dec 2018 08:48:14 -0600 -Subject: [PATCH] add runtimedirectoy to systemd unit file - ---- - distrib/initscripts/service.systemd.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl -index 670f1445..244bcfe6 100644 ---- a/distrib/initscripts/service.systemd.tmpl -+++ b/distrib/initscripts/service.systemd.tmpl -@@ -14,6 +14,7 @@ PIDFile=:PATH_NETATALK_LOCK: - ExecReload=/bin/kill -HUP $MAINPID - Restart=always - RestartSec=1 -+RuntimeDirectory=lock/netatalk - - [Install] - WantedBy=multi-user.target diff --git a/netatalk.conf b/netatalk.conf new file mode 100644 index 0000000..2a4f83b --- /dev/null +++ b/netatalk.conf @@ -0,0 +1 @@ +D /var/run/lock/netatalk 755 root root diff --git a/netatalk.spec b/netatalk.spec index 7b8f033..e6af55a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -29,17 +29,18 @@ Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Source Apple Filing Protocol(AFP) File Server License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT # Project is also mirrored at https://github.com/Netatalk/Netatalk URL: http://netatalk.sourceforge.net Source0: https://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: netatalk.pam-system-auth +Source2: netatalk.conf
# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm Patch0: netatalk-3.0.1-basedir.patch -Patch1: netatalk-systemd-runtimedirectory.patch +Patch1: netatalk-systemd-execstartpre.patch # https://github.com/Netatalk/Netatalk/pull/110 Patch2: netatalk-fix-incorrect-fsf-address.patch # https://github.com/Netatalk/Netatalk/pull/113 @@ -156,6 +157,9 @@ sed -i 's-systemctl daemon-reload\g' distrib/initscripts/Makefile.in # Use specific pam conf. install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk
+# install our tmpfiles config +install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf + find %{buildroot} -name '*.la' -delete -print # Fix python shebang sed -i 's^#!/usr/bin/env python$#!/usr/bin/python3' %{buildroot}/usr/bin/afpstats @@ -191,6 +195,7 @@ sh test/afpd/test.sh %exclude %{_mandir}/man*/netatalk-config* %{_sbindir}/* %{_unitdir}/netatalk.service +%{_tmpfilesdir}/netatalk.conf %{_localstatedir}/lib/netatalk
%files devel @@ -201,6 +206,9 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1*
%changelog +* Sun Mar 03 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-3 +- execstartpre instead of runtimedirectory in service file for el7 compat + * Sun Feb 03 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-2 - fix license - buildrequire perl-generators, require perl version
commit 1139360999d9f4b0a5de8a9ffd9554ed390ee3a4 Author: Andrew Bauer zonexpertconsulting@outlook.com Date: Sat Feb 23 07:37:04 2019 -0600
Initial import (#1658199)
diff --git a/.gitignore b/.gitignore index 8302d47..a5c35e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /netatalk-3.1.7.tar.bz2 +/netatalk-3.1.12.tar.bz2 diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-afpstats-python3-compat.patch b/netatalk-afpstats-python3-compat.patch new file mode 100644 index 0000000..f4ebc72 --- /dev/null +++ b/netatalk-afpstats-python3-compat.patch @@ -0,0 +1,22 @@ +From d2262267537fbe301e218901656b582f021bf67f Mon Sep 17 00:00:00 2001 +From: Andrew Bauer knnniggett@hotmail.com +Date: Wed, 12 Dec 2018 10:19:29 -0600 +Subject: [PATCH] make afpstats python 3 compatible + +--- + contrib/shell_utils/afpstats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/shell_utils/afpstats b/contrib/shell_utils/afpstats +index 8c5413c8..08092208 100755 +--- a/contrib/shell_utils/afpstats ++++ b/contrib/shell_utils/afpstats +@@ -23,7 +23,7 @@ def main(): + + reply = iface.GetUsers() + for name in reply: +- print name ++ print(name) + + if __name__ == '__main__': + main() diff --git a/netatalk-fix-incorrect-fsf-address.patch b/netatalk-fix-incorrect-fsf-address.patch new file mode 100644 index 0000000..2dd0916 --- /dev/null +++ b/netatalk-fix-incorrect-fsf-address.patch @@ -0,0 +1,627 @@ +From 3298a8bd5a67d410ba60a3044dd0aab05d523c40 Mon Sep 17 00:00:00 2001 +From: Andrew Bauer zonexpertconsulting@outlook.com +Date: Wed, 28 Nov 2018 08:52:00 -0600 +Subject: [PATCH 1/2] update gpl mailing address + +--- + COPYING | 4 ++-- + etc/afpd/afprun.c | 2 +- + include/atalk/byteorder.h | 2 +- + include/atalk/ftw.h | 4 ++-- + include/atalk/queue.h | 2 +- + include/atalk/vfs.h | 2 +- + libatalk/adouble/ad_recvfile.c | 2 +- + libatalk/adouble/ad_sendfile.c | 2 +- + libatalk/compat/strlcpy.c | 2 +- + libatalk/unicode/charcnv.c | 2 +- + libatalk/unicode/charsets/generic_cjk.c | 2 +- + libatalk/unicode/charsets/generic_cjk.h | 2 +- + libatalk/unicode/charsets/generic_mb.c | 2 +- + libatalk/unicode/charsets/mac_centraleurope.c | 2 +- + libatalk/unicode/charsets/mac_chinese_simp.c | 2 +- + libatalk/unicode/charsets/mac_chinese_simp.h | 2 +- + libatalk/unicode/charsets/mac_chinese_trad.c | 2 +- + libatalk/unicode/charsets/mac_chinese_trad.h | 2 +- + libatalk/unicode/charsets/mac_cyrillic.c | 2 +- + libatalk/unicode/charsets/mac_greek.c | 2 +- + libatalk/unicode/charsets/mac_hebrew.c | 2 +- + libatalk/unicode/charsets/mac_japanese.c | 2 +- + libatalk/unicode/charsets/mac_japanese.h | 2 +- + libatalk/unicode/charsets/mac_korean.c | 2 +- + libatalk/unicode/charsets/mac_korean.h | 2 +- + libatalk/unicode/charsets/mac_roman.c | 2 +- + libatalk/unicode/charsets/mac_roman.h | 2 +- + libatalk/unicode/charsets/mac_turkish.c | 2 +- + libatalk/unicode/iconv.c | 2 +- + libatalk/unicode/utf8.c | 2 +- + libatalk/util/fault.c | 2 +- + libatalk/util/ftw.c | 4 ++-- + libatalk/vfs/extattr.c | 2 +- + libatalk/vfs/vfs.c | 2 +- + 34 files changed, 35 insertions(+), 35 deletions(-) + +diff --git a/COPYING b/COPYING +index d60c31a9..f7962229 100644 +--- a/COPYING ++++ b/COPYING +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + Also add information on how to contact you by electronic and paper mail. +diff --git a/etc/afpd/afprun.c b/etc/afpd/afprun.c +index ed412476..daba5d7f 100644 +--- a/etc/afpd/afprun.c ++++ b/etc/afpd/afprun.c +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + modified for netatalk dgautheron@magic.fr + */ +diff --git a/include/atalk/byteorder.h b/include/atalk/byteorder.h +index 0ea3972f..1ad33607 100644 +--- a/include/atalk/byteorder.h ++++ b/include/atalk/byteorder.h +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifndef _BYTEORDER_H +diff --git a/include/atalk/ftw.h b/include/atalk/ftw.h +index 157efc50..9d0ae339 100644 +--- a/include/atalk/ftw.h ++++ b/include/atalk/ftw.h +@@ -13,8 +13,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301 USA. */ + + /* + * X/Open Portability Guide 4.2: ftw.h +diff --git a/include/atalk/queue.h b/include/atalk/queue.h +index a3f433eb..92d8b91e 100644 +--- a/include/atalk/queue.h ++++ b/include/atalk/queue.h +@@ -13,7 +13,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifndef ATALK_QUEUE_H +diff --git a/include/atalk/vfs.h b/include/atalk/vfs.h +index 580c22b2..4f16de72 100644 +--- a/include/atalk/vfs.h ++++ b/include/atalk/vfs.h +@@ -13,7 +13,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + vfs layer for afp + */ +diff --git a/libatalk/adouble/ad_recvfile.c b/libatalk/adouble/ad_recvfile.c +index 1703ee83..224ffcd9 100644 +--- a/libatalk/adouble/ad_recvfile.c ++++ b/libatalk/adouble/ad_recvfile.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c +index 2730644b..cf61e15a 100644 +--- a/libatalk/adouble/ad_sendfile.c ++++ b/libatalk/adouble/ad_sendfile.c +@@ -22,7 +22,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/compat/strlcpy.c b/libatalk/compat/strlcpy.c +index 314b039c..487865a3 100644 +--- a/libatalk/compat/strlcpy.c ++++ b/libatalk/compat/strlcpy.c +@@ -17,7 +17,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + strlcpy strlcat functions. + */ +diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c +index 7242b576..9bfbe727 100644 +--- a/libatalk/unicode/charcnv.c ++++ b/libatalk/unicode/charcnv.c +@@ -18,7 +18,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/unicode/charsets/generic_cjk.c b/libatalk/unicode/charsets/generic_cjk.c +index 461af345..2d43f038 100644 +--- a/libatalk/unicode/charsets/generic_cjk.c ++++ b/libatalk/unicode/charsets/generic_cjk.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/unicode/charsets/generic_cjk.h b/libatalk/unicode/charsets/generic_cjk.h +index 3c4a48c7..09eb3573 100644 +--- a/libatalk/unicode/charsets/generic_cjk.h ++++ b/libatalk/unicode/charsets/generic_cjk.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #include <atalk/unicode.h> +diff --git a/libatalk/unicode/charsets/generic_mb.c b/libatalk/unicode/charsets/generic_mb.c +index 0347c3e7..1efafba6 100644 +--- a/libatalk/unicode/charsets/generic_mb.c ++++ b/libatalk/unicode/charsets/generic_mb.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_centraleurope.c b/libatalk/unicode/charsets/mac_centraleurope.c +index 40784be3..37150992 100644 +--- a/libatalk/unicode/charsets/mac_centraleurope.c ++++ b/libatalk/unicode/charsets/mac_centraleurope.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_chinese_simp.c b/libatalk/unicode/charsets/mac_chinese_simp.c +index 2ff6c2a0..97ad8484 100644 +--- a/libatalk/unicode/charsets/mac_chinese_simp.c ++++ b/libatalk/unicode/charsets/mac_chinese_simp.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_simp.h b/libatalk/unicode/charsets/mac_chinese_simp.h +index 25216256..900eb858 100644 +--- a/libatalk/unicode/charsets/mac_chinese_simp.h ++++ b/libatalk/unicode/charsets/mac_chinese_simp.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_trad.c b/libatalk/unicode/charsets/mac_chinese_trad.c +index 116e8cd5..25710535 100644 +--- a/libatalk/unicode/charsets/mac_chinese_trad.c ++++ b/libatalk/unicode/charsets/mac_chinese_trad.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_trad.h b/libatalk/unicode/charsets/mac_chinese_trad.h +index 00e0c518..851c7370 100644 +--- a/libatalk/unicode/charsets/mac_chinese_trad.h ++++ b/libatalk/unicode/charsets/mac_chinese_trad.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_cyrillic.c b/libatalk/unicode/charsets/mac_cyrillic.c +index fde64861..57faf472 100644 +--- a/libatalk/unicode/charsets/mac_cyrillic.c ++++ b/libatalk/unicode/charsets/mac_cyrillic.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_greek.c b/libatalk/unicode/charsets/mac_greek.c +index e48237b6..987b2c7a 100644 +--- a/libatalk/unicode/charsets/mac_greek.c ++++ b/libatalk/unicode/charsets/mac_greek.c +@@ -17,7 +17,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_hebrew.c b/libatalk/unicode/charsets/mac_hebrew.c +index 34d96902..ffdf8495 100644 +--- a/libatalk/unicode/charsets/mac_hebrew.c ++++ b/libatalk/unicode/charsets/mac_hebrew.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_japanese.c b/libatalk/unicode/charsets/mac_japanese.c +index 9f32f662..29a24874 100644 +--- a/libatalk/unicode/charsets/mac_japanese.c ++++ b/libatalk/unicode/charsets/mac_japanese.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_japanese.h b/libatalk/unicode/charsets/mac_japanese.h +index e27e450d..03510bb1 100644 +--- a/libatalk/unicode/charsets/mac_japanese.h ++++ b/libatalk/unicode/charsets/mac_japanese.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_korean.c b/libatalk/unicode/charsets/mac_korean.c +index 26f387d7..08356109 100644 +--- a/libatalk/unicode/charsets/mac_korean.c ++++ b/libatalk/unicode/charsets/mac_korean.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_korean.h b/libatalk/unicode/charsets/mac_korean.h +index 2febaa28..acb2d7b1 100644 +--- a/libatalk/unicode/charsets/mac_korean.h ++++ b/libatalk/unicode/charsets/mac_korean.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_roman.c b/libatalk/unicode/charsets/mac_roman.c +index 34ccaaf9..b615540a 100644 +--- a/libatalk/unicode/charsets/mac_roman.c ++++ b/libatalk/unicode/charsets/mac_roman.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_roman.h b/libatalk/unicode/charsets/mac_roman.h +index 5d2c72e6..096583c6 100644 +--- a/libatalk/unicode/charsets/mac_roman.h ++++ b/libatalk/unicode/charsets/mac_roman.h +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * from GNU libiconv + * modified by Bjorn (Apple Logo 0xf0 to Apple unicode 0xf8ff ) +diff --git a/libatalk/unicode/charsets/mac_turkish.c b/libatalk/unicode/charsets/mac_turkish.c +index 619f4b01..c27a316f 100644 +--- a/libatalk/unicode/charsets/mac_turkish.c ++++ b/libatalk/unicode/charsets/mac_turkish.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/iconv.c b/libatalk/unicode/iconv.c +index c44df315..c7fb7b78 100644 +--- a/libatalk/unicode/iconv.c ++++ b/libatalk/unicode/iconv.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/utf8.c b/libatalk/unicode/utf8.c +index 04dbb9a2..54515d26 100644 +--- a/libatalk/unicode/utf8.c ++++ b/libatalk/unicode/utf8.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/util/fault.c b/libatalk/util/fault.c +index 48c4fe05..7ce3c131 100644 +--- a/libatalk/util/fault.c ++++ b/libatalk/util/fault.c +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/util/ftw.c b/libatalk/util/ftw.c +index f0ac17f1..35bccac9 100644 +--- a/libatalk/util/ftw.c ++++ b/libatalk/util/ftw.c +@@ -15,8 +15,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301 USA. */ + + #ifdef HAVE_CONFIG_H + #include "config.h" +diff --git a/libatalk/vfs/extattr.c b/libatalk/vfs/extattr.c +index 32cdc65d..39f4437b 100644 +--- a/libatalk/vfs/extattr.c ++++ b/libatalk/vfs/extattr.c +@@ -18,7 +18,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + sys_copyxattr modified from LGPL2.1 libattr copyright + Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. +diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c +index 0d1961cf..236228cf 100644 +--- a/libatalk/vfs/vfs.c ++++ b/libatalk/vfs/vfs.c +@@ -14,7 +14,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ + #ifdef HAVE_CONFIG_H + +From 9ac8d1d49f6a214b609905eeecd67c698090e18a Mon Sep 17 00:00:00 2001 +From: Andrew Bauer knnniggett@users.sourceforge.net +Date: Wed, 28 Nov 2018 19:58:07 -0600 +Subject: [PATCH 2/2] update COPYING + +--- + COPYING | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/COPYING b/COPYING +index f7962229..d159169d 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. +-
+- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +-
++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +-
++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +-
++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +-
+- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. diff --git a/netatalk-systemd-runtimedirectory.patch b/netatalk-systemd-runtimedirectory.patch new file mode 100644 index 0000000..57fb3d6 --- /dev/null +++ b/netatalk-systemd-runtimedirectory.patch @@ -0,0 +1,21 @@ +From 49c003d821dbe179a58dbd8abe5716de01b76d21 Mon Sep 17 00:00:00 2001 +From: Andrew Bauer zonexpertconsulting@outlook.com +Date: Thu, 6 Dec 2018 08:48:14 -0600 +Subject: [PATCH] add runtimedirectoy to systemd unit file + +--- + distrib/initscripts/service.systemd.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl +index 670f1445..244bcfe6 100644 +--- a/distrib/initscripts/service.systemd.tmpl ++++ b/distrib/initscripts/service.systemd.tmpl +@@ -14,6 +14,7 @@ PIDFile=:PATH_NETATALK_LOCK: + ExecReload=/bin/kill -HUP $MAINPID + Restart=always + RestartSec=1 ++RuntimeDirectory=lock/netatalk + + [Install] + WantedBy=multi-user.target diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..2cced33 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke +session include system-auth +-session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..7b8f033 --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,756 @@ +%global _hardened_build 1 + +%global pkgver $(rpm -qls tracker-devel.%{_target_cpu} | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2|sort -u) +%global with_tracker 1 +%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) +%global with_acls 1 +%global with_bdb 1 +%global with_cracklib 1 +%global with_docbook 1 +%global with_dbus 1 +%global with_dtrace 1 +%global with_ldap 1 +%global with_libevent 1 +%global with_mysql 1 +%global with_procpsng 1 +%global with_quota 1 +%global without_openafs 1 + +# tcp_wrappers deprecated fedora >= 28 +%if 0%{?fedora} >= 28 +%global without_tcp_wrappers 1 +%endif + +# rhel need to call ldconfig +%if 0%{?rhel} +%global ldconfig /sbin/ldconfig +%endif + +Name: netatalk +Epoch: 5 +Version: 3.1.12 +Release: 2%{?dist} +Summary: Open Source Apple Filing Protocol(AFP) File Server +License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT +# Project is also mirrored at https://github.com/Netatalk/Netatalk +URL: http://netatalk.sourceforge.net +Source0: https://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 +Source1: netatalk.pam-system-auth + +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +Patch1: netatalk-systemd-runtimedirectory.patch +# https://github.com/Netatalk/Netatalk/pull/110 +Patch2: netatalk-fix-incorrect-fsf-address.patch +# https://github.com/Netatalk/Netatalk/pull/113 +Patch3: netatalk-afpstats-python3-compat.patch + +BuildRequires: rpm +BuildRequires: grep +BuildRequires: perl-interpreter +BuildRequires: perl-generators +BuildRequires: sed +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: avahi-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: libattr-devel +BuildRequires: libgcrypt-devel +BuildRequires: krb5-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: systemd +BuildRequires: libtdb-devel + +%{?with_cracklib:BuildRequires: cracklib-devel} +%{?with_dbus:BuildRequires: dbus-devel} +%{?with_dbus:BuildRequires: dbus-glib-devel} +%{?with_docbook:BuildRequires: docbook-style-xsl} +%{?with_acls:BuildRequires: libacl-devel} +%{?with_bdb:BuildRequires: libdb-devel} +%{!?with_bdb:BuildRequires: db4-devel} +%{?with_libevent:BuildRequires: libevent-devel} +%{?with_docbook:BuildRequires: libxslt} +%{?with_mysql:BuildRequires: mysql-devel} +%{?with_ldap:BuildRequires: openldap-devel} +%{?with_procpsng:BuildRequires: procps-ng} +%{!?with_procng:BuildRequires: procps} +%{?with_quota:BuildRequires: quota-devel} +%{?with_dtrace:BuildRequires: systemtap-sdt-devel} +%{?with_tracker:BuildRequires: tracker-devel} +%{!?without_openafs:BuildRequires: openafs-devel} +%{!?without_tcp_wrappers:BuildRequires: tcp_wrappers-devel} + +Requires: dbus-python +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%{?with_tracker:Requires: dconf} +%{?ldconfig:Requires(post): %{ldconfig}} +%{?ldconfig:Requires(postun): %{ldconfig}} +%{?systemd_requires} + +%description +Netatalk is a freely-available Open Source AFP file server. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -p 1 +%{?with_libevent:rm -frv libevent/} + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include ( -name '*.h' -a -executable ) -exec chmod -x {} ; + +# Don't call systemctl daemon-reload during the build +sed -i 's-systemctl daemon-reload\g' distrib/initscripts/Makefile.in + +%build + +%configure \ + --localstatedir=%{_localstatedir}/lib \ + --with-kerberos \ + --with-libgcrypt \ + --with-pam \ + --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ + --with-shadow \ + --with-tbd=no \ + --with-uams-path=%{_libdir}/netatalk \ + --enable-pgp-uam \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ + --with-init-style=redhat-systemd \ + --without-tdb \ + --with-bdb \ + --with-lockfile=%{_rundir}/lock/netatalk/netatalk \ + --disable-silent-rules \ + --disable-static \ + %{?with_acls:--with-acl} \ + %{?with_cracklib:--with-cracklib} \ + %{?with_docbook:--with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver}} \ + %{?with_tracker:--with-spotlight} \ + %{?with_tracker:--with-tracker-pkgconfig-version=%{pkgver}} \ + %{?with_tracker:--with-dbus-daemon=%{_bindir}/dbus-daemon} \ + %{?with_libevent:--without-libevent} \ + %{?with_libevent:--with-libevent-header=%{_includedir}} \ + %{?with_libevent:--with-libevent-lib=%{_libdir}} + +%make_build +# Build the local docs. +%make_build -C doc/manual html-local + +%install +%make_install +# Use specific pam conf. +install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk + +find %{buildroot} -name '*.la' -delete -print +# Fix python shebang +sed -i 's^#!/usr/bin/env python$#!/usr/bin/python3' %{buildroot}/usr/bin/afpstats + +%check +sh test/afpd/test.sh + +%post +%systemd_post %{name}.service +%{?ldconfig} + +%preun +%systemd_preun %{name}.service + +%postun +%systemd_postun_with_restart %{name}.service +%{?ldconfig} + +%files +%license COPYING COPYRIGHT +%doc AUTHORS CONTRIBUTORS NEWS doc/manual/*.html +%dir %{_sysconfdir}/netatalk +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.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 +%{_bindir}/* +%exclude %{_bindir}/netatalk-config +%{_libdir}/netatalk/ +%{_libdir}/libatalk.so.* +%{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* +%{_sbindir}/* +%{_unitdir}/netatalk.service +%{_localstatedir}/lib/netatalk + +%files devel +%{_bindir}/netatalk-config +%{_datadir}/aclocal/netatalk.m4 +%{_includedir}/atalk/ +%{_libdir}/libatalk.so +%{_mandir}/man*/netatalk-config.1* + +%changelog +* Sun Feb 03 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-2 +- fix license +- buildrequire perl-generators, require perl version +- fix epoch + +* Wed Jan 09 2019 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.12-1 +- Netatalk 3.1.12 release + +* Wed Dec 12 2018 Andrew Bauer zonexpertconsulting@outlook.com - 5:3.1.11-2 +- Refactor specfile +- remove sysv init support +- let systemd manage lockfile folder +- call ldconfig only for el7 +- patch afpstats for python3 + +* Wed Oct 31 2018 HAT hat@fa2.so-net.ne.jp - 5:3.1.11-1.4 +- always buildrequres gcc + +* Tue Apr 03 2018 HAT hat@fa2.so-net.ne.jp - 5:3.1.11-1.3 +- always buildrequres perl-interpreter + +* Thu Mar 22 2018 HAT hat@fa2.so-net.ne.jp - 5:3.1.11-1.2 +- If Fedora >=28, don't use tcp_wrappers +- If Fedora >=28, buildrequres perl-interpreter + +* Tue Mar 20 2018 HAT hat@fa2.so-net.ne.jp - 5:3.1.11-1.1 +- pam_ck_connector.so isn't always installed (RHBZ#1246465) +- require dconf package (RHBZ#1248157) +- require perl-IO-Socket-INET6 for asip-status.pl script +- define with_ldap (RHBZ#1249403) +- The UAM path should be netatalk, not atalk (RHBZ#1249404) +- fix multilib conflict of tracker-devel (SF BUG#637) +- If el6, use "make %%{?_smp_mflags}", not "%%make_build" macro +- If el6, disable tracker +- If el6, use db4-devel, not libdb-devel +- If el6, use bundled libevent2, not libevent1 package +- If el6, use procps, not procps-ng + +* Fri Dec 01 2017 Ryan Breaker ryan@breaker.rocks - 3.1.11-1 +- Revival of package from abandonment. +- Update to 3.1.11 +- Remove patch previously applied to 3.1.7, is now applied to upstream of project + +* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-7 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + +* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 04 2014 Christopher Meng rpm@cicku.me - 4:3.1.3-1 +- Update to 3.1.3 + +* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 +- Rebuild for new libgcrypt + +* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 +- Perl 5.18 rebuild + +* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + +* Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 +- fixed build issue on f18 + +* Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + +* Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + +* Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + +* Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + +* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + +* Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + +* Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + +* Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + +* Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + +* Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 +- updated to latest upstream version + +* Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + +* Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 +- updated to latest upstream version + +* Fri May 28 2010 Jiri Skala jskala@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@redhat.com - 4:2.1-1 +- updated to latest upstream version + +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 +- updated to latest upstream version + +* Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + +* Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 +- fixed #473943 + +* Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 +- rebuilt with new openssl + +* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 +- updated to latest upstream version + +* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:2.0.3-25 +- fixed epoch in the subpackage requires + +* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:2.0.3-24 +- fix #473186 conflict timeout with coreutils + +* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 +- rebuild with new openssl + +* Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + +* Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + +* Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 +- fix license tag + +* Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 +- make init script LSB compliant (#246993) + +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 +- fix unowned directories (#233889) + +* Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 +- rebuild for gcc-4.3 + +* Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 +- rebuild + +* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 +- patch to build on FC, bad open call + +* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 +- rebuild + +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + +* Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + +* Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 +- fix fiew problems in spec + +* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 +- rebuild against new db4 + +* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + +* Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + +* Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 +- rebuild + +* Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + +* Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com +- rebuild for new gcc, glibc, glibc-kernheaders + +* Fri Dec 09 2005 Jesse Keating jkeating@redhat.com +- rebuilt + +* Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com +- Rebuild for new openssl dependencies + +* Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com +- use include instead of pam_stack in pam config + +* Wed Jul 20 2005 Bill Nottingham notting@redhat.com +- don't run by default + +* Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + +* Wed Mar 30 2005 Florian La Roche laroche@redhat.com +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + +* Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com +- Fix for gcc4 compilation: extern_ucreator.patch + +* Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com +- Upgraded to upstream version 2.0.2 . + +* Tue Jun 15 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Tue Mar 02 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Fri Feb 13 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett ccb@redhat.com +- Update with 1.6.3 upstream sources + +* Tue Jul 29 2003 Elliot Lee sopwith@redhat.com +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + +* Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers timp@redhat.com +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuildfedora + +* Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 +- Updated to 1.5.5 + +* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) + +* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-3 +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + +* Thu Mar 14 2002 Bill Nottingham notting@redhat.com +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham notting@redhat.com +- it's back + +* Fri Mar 2 2001 Tim Powers timp@redhat.com +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers timp@redhat.com +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers timp@redhat.com +- updated initscript + +* Thu Jan 04 2001 Than Ngo than@redhat.com +- fixed uams-path +- added noreplace to %%config + +* Mon Nov 20 2000 Tim Powers timp@redhat.com +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo than@redhat.com +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo than@redhat.de +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers timp@redhat.com +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo than@redhat.de +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers timp@redhat.com +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector prospector@redhat.com +- rebuilt + +* Sun Jul 23 2000 Tim Powers timp@redhat.com +- rebuilt + +* Mon Jul 17 2000 Tim Powers timp@redhat.com +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo than@redhat.de +- rebuilt + +* Thu Jul 06 2000 Tim Powers timp@redhat.com +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo than@redhat.de +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo than@redhat.de +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers timp@redhat.com +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers timp@redhat.com +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai nalin@redhat.com +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers timp@redhat.com +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %%install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %%defattr to %%files section + +* Tue Aug 3 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. + +* Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + +* Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp +- [asun2.1.3] + +* Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-8] + +* Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-6] + +* Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-3] + +* Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-3 source. + +* Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-2 source. + +* Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Fix rcX.d's symbolic links. + +* Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + +* Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-10a source. + +* Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-8 source. Add chkconfig support. + +* Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Comment out -DCRLF. Use RPM_OPT_FLAGS. + +* Tue Sep 8 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. + +* Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-6 source. + +* Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-5 source. + +* Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp +- Use pre-asun2.1.0-3 source. + +* Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages + +* Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + asun@saul9.u.washington.edu to provide an AppleShareIP file server + +- Included AppleVolumes.system file maintained by Johnson + johnson@stpt.usf.edu + +* Mon Aug 25 1997 David Gibson D.Gibson@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@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. +- 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@zorak.gsfc.nasa.gov +- Updated for /etc/pam.d diff --git a/sources b/sources index b8bf15d..f9760a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2 +SHA512 (netatalk-3.1.12.tar.bz2) = 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
commit e3e403eaa35d5b0ed7abf88f4ae6bf675f5073dd Author: Andrew Bauer zonexpertconsulting@outlook.com Date: Sat Feb 23 07:35:13 2019 -0600
remove former netatalk files
diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch deleted file mode 100644 index f289baa..0000000 --- a/netatalk-3.0.1-basedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 -+++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 -@@ -6,7 +6,7 @@ - ; Global server settings - - ; [Homes] --; basedir regex = /xxxx -+; basedir regex = /home - - ; [My AFP Volume] - ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch deleted file mode 100644 index e4b8b28..0000000 --- a/netatalk-3.1.7-autotools.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure ---- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 -+++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 -@@ -17226,8 +17226,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 - $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} - fi -@@ -17382,8 +17382,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" - if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : - -diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 ---- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 -+++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 -@@ -18,8 +18,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) - fi - -@@ -64,8 +64,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) - - # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth deleted file mode 100644 index 2c0c0b2..0000000 --- a/netatalk.pam-system-auth +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 -auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so -auth include system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -# pam_selinux.so close should be the first session rule -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the user context -session required pam_selinux.so open -session required pam_namespace.so -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec deleted file mode 100644 index 65977c9..0000000 --- a/netatalk.spec +++ /dev/null @@ -1,770 +0,0 @@ -%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_dbus 1 - -%global with_dtrace 1 - -%global with_mysql 1 - -%global with_openafs 0 - -%global with_quota 1 - -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_systemd 1 -%else -%global with_systemd 0 -%endif - -%global with_tcp_wrappers 1 - -%global with_tracker 1 - -Name: netatalk -Epoch: 5 -Version: 3.1.7 -Release: 2%{?dist} -Summary: Open Source Apple Filing Protocol(AFP) fileserver -License: GPLv2+ -URL: http://netatalk.sourceforge.net/ -Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 -Source1: netatalk.pam-system-auth -# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm -Patch0: netatalk-3.0.1-basedir.patch -# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS -Patch1: netatalk-3.1.7-autotools.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_mysql} -BuildRequires: mysql-devel -%endif -%if 0%{?with_openafs} -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. A *NIX/*BSD -system running Netatalk is capable of serving many Macintosh clients -simultaneously as an AppleShare file server (AFP). - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q -rm -frv libevent/ -%patch0 -p1 -%patch1 -p1 - -# Avoid re-running the autotools -touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 - -# fix permissions -find include ( -name '*.h' -a -executable ) -exec chmod -x {} ; - -%build -%ifarch ppc ppc64 s390 s390x -export CFLAGS="$CFLAGS -fsigned-char" -%endif - -%configure \ - --localstatedir=%{_localstatedir}/lib \ -%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 -%make_install -# Ghost lock dir. -mkdir -p %{buildroot}/var/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 -/sbin/ldconfig - -%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 -fi -%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 -/sbin/ldconfig - -%files -%doc AUTHORS CONTRIBUTORS NEWS -%license COPYING COPYRIGHT -%doc doc/manual/*.html -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf -%dir %{_sysconfdir}/netatalk -%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 -%{_bindir}/* -%exclude %{_bindir}/netatalk-config -%{_libdir}/atalk/ -%{_libdir}/libatalk.so.* -%{_mandir}/man*/* -%exclude %{_mandir}/man*/netatalk-config* -%{_sbindir}/* -%if 0%{?with_systemd} -%{_unitdir}/netatalk.service -%else -%{_initrddir}/netatalk -%endif -%ghost %dir /var/lock/netatalk -%{_localstatedir}/lib - -%files devel -%{_bindir}/netatalk-config -%{_datadir}/aclocal/netatalk.m4 -%{_includedir}/atalk/ -%{_libdir}/libatalk.so -%{_mandir}/man*/netatalk-config.1* - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 5:3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 -- Increment epoch. Missed to reset %%release in previous change. - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-7 -- Upstream update to 3.1.7 (RHBZ#1134783). -- Remove doc from *-devel. -- Add %%license. -- Update %%description from - http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 -- Address F23FTBFS, RHBZ#1239711: - - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, - netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, - netatalk-2.2.3-sigterm.patch (Unused) - - Add netatalk-3.0.1-basedir.patch. - - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - - Fix permissions on include-files. - - Remove duplicate %%global with_mysql. - - Enable dbus. - - Add missing "fi" in %%preun. - - Run /sbin/ldconfig in %%postun, %%preun. - - Reflect /var/lock/netatalk is hard-coded into the sources. - - Set --localstatedir=/var/lib (/var/netatalk violates FHS). - -* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 04 2014 Christopher Meng rpm@cicku.me - 4:3.1.3-1 -- Update to 3.1.3 - -* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 -- Rebuild for new libgcrypt - -* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 -- Perl 5.18 rebuild - -* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 -- Scriptlets replaced with new systemd macros - -* Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 -- fixed build issue on f18 - -* Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 -- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX - client, crashes Finder netatalk-2.2.2-1 - -* Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 -- fixes: #831001 - netatalk pam configuration has invalid entry - -* Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 -- fixes #828205 - update to latest upstream netatalk-2.2.3 - -* Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 -- fixes #782049 - update to latest upstream netatalk-2.2.2 - -* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 -- fixes #501144 - updated and redirected pam config - -* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 -- update to latest upstream netatalk-2.2.1 - -* Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 -- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel - -* Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 -- fixed missing epoch in sysvinit subpackage and triggers - -* Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 -- fixes #714448 - systemd-service -- moves SysV initscript to subpackage - -* Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 -- update to latest upstream netatalk-2.2.0 - -* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 -- updated to latest upstream version netatalk-2.1.5 - -* Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 -- updated to latest upstream version - -* Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 -- updated to latest upstream version -- added license texts to devel subpackage - -* Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 -- updated to latest upstream version - -* Fri May 28 2010 Jiri Skala jskala@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@redhat.com - 4:2.1-1 -- updated to latest upstream version - -* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 -- oops forgot upload new sources => shifted release number - -* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 -- updated to latest upstream version - -* Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 -- added BuildRequires: ... libgcrypt-devel -- removed outdated atalk.init - -* Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 -- fixed #473943 - -* Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 -- rebuilt with new openssl - -* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 -- updated to latest upstream version - -* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 -- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability - -* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:2.0.3-25 -- fixed epoch in the subpackage requires - -* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:2.0.3-24 -- fix #473186 conflict timeout with coreutils - -* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 -- rebuild with new openssl - -* Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 -- fix #473939 netatalk-2.0.3-21.fc10 disable quota - -* Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 -- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches - -* Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 -- fix license tag - -* Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 -- fix chmod o+x (#225085) -- increase the maximum number of cnid_dbd processes to 512 (#232805) -- papd now writes debugging output to stderr when invoked with -d (#150021) -- fix multiarch conflict for netatalk-devel (#342681) - -* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 -- make init script LSB compliant (#246993) - -* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 -- fix unowned directories (#233889) - -* Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 -- rebuild for gcc-4.3 - -* Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 -- rebuild - -* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 -- patch to build on FC, bad open call - -* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 -- rebuild - -* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 -- Rebuild for selinux ppc32 issue. - -* Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 -- fix from merge review -- Resolves #226190 - -* Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 -- fix fiew problems in spec - -* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 -- rebuild against new db4 - -* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 -- BuildRequires changed from cracklib to cracklib-devel - -* Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 -- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* - (#203001) -- Add dist tag - -* Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 -- rebuild - -* Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 -- rebuild for broken libgssapi deps and brew build - -* Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com -- rebuild for new gcc, glibc, glibc-kernheaders - -* Fri Dec 09 2005 Jesse Keating jkeating@redhat.com -- rebuilt - -* Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com -- Rebuild for new openssl dependencies - -* Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com -- use include instead of pam_stack in pam config - -* Wed Jul 20 2005 Bill Nottingham notting@redhat.com -- don't run by default - -* Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com -- Upgrade to upstream version 2.0.3 -- fix bug 160486: use netatalk's initscript - -* Wed Mar 30 2005 Florian La Roche laroche@redhat.com -- quick fix: rm -f /usr/include/netatalk/at.h until this - is resolved the correct way - -* Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com -- Fix for gcc4 compilation: extern_ucreator.patch - -* Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com -- Upgraded to upstream version 2.0.2 . - -* Tue Jun 15 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Tue Mar 02 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Fri Feb 13 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de -- 1.6.4 - -* Fri Aug 1 2003 Charlie Bennett ccb@redhat.com -- Update with 1.6.3 upstream sources - -* Tue Jul 29 2003 Elliot Lee sopwith@redhat.com -- Rebuild -- Fix perl multilib path editing -- Add pathcat patch - -* Thu May 1 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 -- Make multilib generic -- Add builddep on quota (for rpcsvc/rquota.h) - -* Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 -- fix initscript error (#82118) - -* Wed Jan 22 2003 Tim Powers timp@redhat.com -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 -- patch for compile errors with new ssl libs -- rebuildfedora - -* Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de -- postun should never fail - -* Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 -- Updated to 1.5.5 - -* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) -- Fixed missing /usr/share/netatalk dir (#67222) - -* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 -- automated rebuild - -* Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 -- Updated to latest version 1.5.3.1. -- Fixed bug for nls file lookup (#66300). - -* Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 -- Fixed initscript bug where you can't use blanks inside of names (#64926). - -* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-3 -- Fixed initscript to use correct config files from /etc/atalk (#62803) -- Changed initscript to use $0 instead of direct string (#61734) -- Change Copyright to Licencse and switch from BSD to GPL (#61746) - -* Thu Mar 14 2002 Bill Nottingham notting@redhat.com -- don't run by default - -* Wed Mar 13 2002 Bill Nottingham notting@redhat.com -- it's back - -* Fri Mar 2 2001 Tim Powers timp@redhat.com -- rebuilt against openssl-0.9.6-1 - -* Sun Feb 25 2001 Tim Powers timp@redhat.com -- fixed bug 29370. This package is trying to include a file glibc already includes - -* Tue Jan 23 2001 Tim Powers timp@redhat.com -- updated initscript - -* Thu Jan 04 2001 Than Ngo than@redhat.com -- fixed uams-path -- added noreplace to %%config - -* Mon Nov 20 2000 Tim Powers timp@redhat.com -- rebuilt to fix bad dir perms - -* Fri Nov 10 2000 Than Ngo than@redhat.com -- update to 1.5pre2 (bug #19737, #20397) -- update Url and ftp site -- clean up specfile -- netatalk-1.4b2+asun obsolete - -* Mon Aug 07 2000 Than Ngo than@redhat.de -- fix dependency with glibc-devel (Bug #15589) -- fix typo in description (Bug #15479) - -* Wed Aug 2 2000 Tim Powers timp@redhat.com -- fix symlinks not being relative. - -* Fri Jul 28 2000 Than Ngo than@redhat.de -- add missing restart function in startup script - -* Fri Jul 28 2000 Tim Powers timp@redhat.com -- fixed initscripts so that condrestart doesn't return 1 when the test fails - -* Mon Jul 24 2000 Prospector prospector@redhat.com -- rebuilt - -* Sun Jul 23 2000 Tim Powers timp@redhat.com -- rebuilt - -* Mon Jul 17 2000 Tim Powers timp@redhat.com -- inits back to rc.d/init.d, using service to start inits - -* Wed Jul 12 2000 Than Ngo than@redhat.de -- rebuilt - -* Thu Jul 06 2000 Tim Powers timp@redhat.com -- fixed broken PreReq, now PreReq's /etc/init.d - -* Tue Jun 27 2000 Than Ngo than@redhat.de -- remove prereq initscripts, add requires initscripts -- clean up specfile - -* Mon Jun 26 2000 Than Ngo than@redhat.de -- /etc/rc.d/init.d -> /etc/init.d -- add condrestart directive -- fix post/preun/postun scripts -- prereq initscripts >= 5.20 - -* Tue Jun 20 2000 Tim Powers timp@redhat.com -- fixed bug 11420 concerning the building with -O2. - -* Thu Jun 8 2000 Tim Powers timp@redhat.com -- fix bug #11978 -- fix man page locations to be FHS compliant - -* Thu Jun 1 2000 Nalin Dahyabhai nalin@redhat.com -- modify PAM setup to use system-auth - -* Thu Dec 16 1999 Tim Powers timp@redhat.com -- renewed source so it is pristine, delete the problematic files in spec file - instead -- general spec file cleanups, create buildroot and dirs in the %%install - section -- strip binaries -- gzip man pages -- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too -- changed group -- added %%defattr to %%files section - -* Tue Aug 3 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp -- Change Copyright tag to BSD. - Add /usr/bin/adv1tov2. - -* Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp -- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. - -* Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp -- [asun2.1.3] - -* Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-8] - -* Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-6] - -* Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-3] - -* Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.1-3 source. - -* Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.1-2 source. - -* Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Fix rcX.d's symbolic links. - -* Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. - -* Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-10a source. - -* Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-8 source. Add chkconfig support. - -* Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Comment out -DCRLF. Use RPM_OPT_FLAGS. - -* Tue Sep 8 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. - -* Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-6 source. - -* Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-5 source. - -* Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp -- Use pre-asun2.1.0-3 source. - -* Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Add afpovertcp entries to /etc/services -- Remove BuildRoot in man8 pages - -* Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun - asun@saul9.u.washington.edu to provide an AppleShareIP file server - -- Included AppleVolumes.system file maintained by Johnson - johnson@stpt.usf.edu - -* Mon Aug 25 1997 David Gibson D.Gibson@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@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. -- 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@zorak.gsfc.nasa.gov -- Updated for /etc/pam.d
commit ec9b0d142769facb9402612075fd30ef66110453 Author: Mohan Boddu mboddu@bhujji.com Date: Thu Feb 21 15:51:51 2019 -0500
Revert "2016-05-19: Retired orphaned package, because it was orphaned for"
Unretirement for https://pagure.io/releng/issue/7984
This reverts commit 81611ededd7b668145715779723c60d84ef74003.
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8302d47 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/netatalk-3.1.7.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 164cb9a..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -2016-05-19: Retired orphaned package, because it was orphaned for -more than six weeks. - diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch new file mode 100644 index 0000000..e4b8b28 --- /dev/null +++ b/netatalk-3.1.7-autotools.patch @@ -0,0 +1,50 @@ +diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure +--- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 ++++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 +@@ -17226,8 +17226,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 + $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} + fi +@@ -17382,8 +17382,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" + if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : + +diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 +--- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 ++++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 +@@ -18,8 +18,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) + fi + +@@ -64,8 +64,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) + + # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..2c0c0b2 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke +session include system-auth +session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..65977c9 --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,770 @@ +%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_dbus 1 + +%global with_dtrace 1 + +%global with_mysql 1 + +%global with_openafs 0 + +%global with_quota 1 + +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +%global with_tcp_wrappers 1 + +%global with_tracker 1 + +Name: netatalk +Epoch: 5 +Version: 3.1.7 +Release: 2%{?dist} +Summary: Open Source Apple Filing Protocol(AFP) fileserver +License: GPLv2+ +URL: http://netatalk.sourceforge.net/ +Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 +Source1: netatalk.pam-system-auth +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS +Patch1: netatalk-3.1.7-autotools.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_mysql} +BuildRequires: mysql-devel +%endif +%if 0%{?with_openafs} +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. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q +rm -frv libevent/ +%patch0 -p1 +%patch1 -p1 + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include ( -name '*.h' -a -executable ) -exec chmod -x {} ; + +%build +%ifarch ppc ppc64 s390 s390x +export CFLAGS="$CFLAGS -fsigned-char" +%endif + +%configure \ + --localstatedir=%{_localstatedir}/lib \ +%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 +%make_install +# Ghost lock dir. +mkdir -p %{buildroot}/var/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 +/sbin/ldconfig + +%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 +fi +%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 +/sbin/ldconfig + +%files +%doc AUTHORS CONTRIBUTORS NEWS +%license COPYING COPYRIGHT +%doc doc/manual/*.html +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf +%dir %{_sysconfdir}/netatalk +%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 +%{_bindir}/* +%exclude %{_bindir}/netatalk-config +%{_libdir}/atalk/ +%{_libdir}/libatalk.so.* +%{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* +%{_sbindir}/* +%if 0%{?with_systemd} +%{_unitdir}/netatalk.service +%else +%{_initrddir}/netatalk +%endif +%ghost %dir /var/lock/netatalk +%{_localstatedir}/lib + +%files devel +%{_bindir}/netatalk-config +%{_datadir}/aclocal/netatalk.m4 +%{_includedir}/atalk/ +%{_libdir}/libatalk.so +%{_mandir}/man*/netatalk-config.1* + +%changelog +* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-7 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + +* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 04 2014 Christopher Meng rpm@cicku.me - 4:3.1.3-1 +- Update to 3.1.3 + +* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 +- Rebuild for new libgcrypt + +* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 +- Perl 5.18 rebuild + +* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + +* Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 +- fixed build issue on f18 + +* Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + +* Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + +* Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + +* Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + +* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + +* Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + +* Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + +* Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + +* Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + +* Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 +- updated to latest upstream version + +* Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + +* Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 +- updated to latest upstream version + +* Fri May 28 2010 Jiri Skala jskala@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@redhat.com - 4:2.1-1 +- updated to latest upstream version + +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 +- updated to latest upstream version + +* Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + +* Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 +- fixed #473943 + +* Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 +- rebuilt with new openssl + +* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 +- updated to latest upstream version + +* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:2.0.3-25 +- fixed epoch in the subpackage requires + +* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:2.0.3-24 +- fix #473186 conflict timeout with coreutils + +* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 +- rebuild with new openssl + +* Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + +* Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + +* Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 +- fix license tag + +* Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 +- make init script LSB compliant (#246993) + +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 +- fix unowned directories (#233889) + +* Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 +- rebuild for gcc-4.3 + +* Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 +- rebuild + +* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 +- patch to build on FC, bad open call + +* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 +- rebuild + +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + +* Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + +* Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 +- fix fiew problems in spec + +* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 +- rebuild against new db4 + +* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + +* Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + +* Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 +- rebuild + +* Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + +* Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com +- rebuild for new gcc, glibc, glibc-kernheaders + +* Fri Dec 09 2005 Jesse Keating jkeating@redhat.com +- rebuilt + +* Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com +- Rebuild for new openssl dependencies + +* Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com +- use include instead of pam_stack in pam config + +* Wed Jul 20 2005 Bill Nottingham notting@redhat.com +- don't run by default + +* Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + +* Wed Mar 30 2005 Florian La Roche laroche@redhat.com +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + +* Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com +- Fix for gcc4 compilation: extern_ucreator.patch + +* Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com +- Upgraded to upstream version 2.0.2 . + +* Tue Jun 15 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Tue Mar 02 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Fri Feb 13 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett ccb@redhat.com +- Update with 1.6.3 upstream sources + +* Tue Jul 29 2003 Elliot Lee sopwith@redhat.com +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + +* Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers timp@redhat.com +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuildfedora + +* Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 +- Updated to 1.5.5 + +* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) + +* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-3 +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + +* Thu Mar 14 2002 Bill Nottingham notting@redhat.com +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham notting@redhat.com +- it's back + +* Fri Mar 2 2001 Tim Powers timp@redhat.com +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers timp@redhat.com +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers timp@redhat.com +- updated initscript + +* Thu Jan 04 2001 Than Ngo than@redhat.com +- fixed uams-path +- added noreplace to %%config + +* Mon Nov 20 2000 Tim Powers timp@redhat.com +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo than@redhat.com +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo than@redhat.de +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers timp@redhat.com +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo than@redhat.de +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers timp@redhat.com +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector prospector@redhat.com +- rebuilt + +* Sun Jul 23 2000 Tim Powers timp@redhat.com +- rebuilt + +* Mon Jul 17 2000 Tim Powers timp@redhat.com +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo than@redhat.de +- rebuilt + +* Thu Jul 06 2000 Tim Powers timp@redhat.com +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo than@redhat.de +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo than@redhat.de +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers timp@redhat.com +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers timp@redhat.com +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai nalin@redhat.com +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers timp@redhat.com +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %%install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %%defattr to %%files section + +* Tue Aug 3 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. + +* Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + +* Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp +- [asun2.1.3] + +* Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-8] + +* Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-6] + +* Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-3] + +* Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-3 source. + +* Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-2 source. + +* Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Fix rcX.d's symbolic links. + +* Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + +* Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-10a source. + +* Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-8 source. Add chkconfig support. + +* Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Comment out -DCRLF. Use RPM_OPT_FLAGS. + +* Tue Sep 8 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. + +* Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-6 source. + +* Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-5 source. + +* Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp +- Use pre-asun2.1.0-3 source. + +* Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages + +* Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + asun@saul9.u.washington.edu to provide an AppleShareIP file server + +- Included AppleVolumes.system file maintained by Johnson + johnson@stpt.usf.edu + +* Mon Aug 25 1997 David Gibson D.Gibson@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@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. +- 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@zorak.gsfc.nasa.gov +- Updated for /etc/pam.d diff --git a/sources b/sources new file mode 100644 index 0000000..b8bf15d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2
commit 81611ededd7b668145715779723c60d84ef74003 Author: Till Maas opensource@till.name Date: Thu May 19 22:34:18 2016 +0200
2016-05-19: Retired orphaned package, because it was orphaned for more than six weeks.
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8302d47..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/netatalk-3.1.7.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch deleted file mode 100644 index f289baa..0000000 --- a/netatalk-3.0.1-basedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 -+++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 -@@ -6,7 +6,7 @@ - ; Global server settings - - ; [Homes] --; basedir regex = /xxxx -+; basedir regex = /home - - ; [My AFP Volume] - ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch deleted file mode 100644 index e4b8b28..0000000 --- a/netatalk-3.1.7-autotools.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure ---- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 -+++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 -@@ -17226,8 +17226,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 - $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} - fi -@@ -17382,8 +17382,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" - if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : - -diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 ---- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 -+++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 -@@ -18,8 +18,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) - fi - -@@ -64,8 +64,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) - - # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth deleted file mode 100644 index 2c0c0b2..0000000 --- a/netatalk.pam-system-auth +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 -auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so -auth include system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -# pam_selinux.so close should be the first session rule -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the user context -session required pam_selinux.so open -session required pam_namespace.so -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec deleted file mode 100644 index 65977c9..0000000 --- a/netatalk.spec +++ /dev/null @@ -1,770 +0,0 @@ -%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_dbus 1 - -%global with_dtrace 1 - -%global with_mysql 1 - -%global with_openafs 0 - -%global with_quota 1 - -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_systemd 1 -%else -%global with_systemd 0 -%endif - -%global with_tcp_wrappers 1 - -%global with_tracker 1 - -Name: netatalk -Epoch: 5 -Version: 3.1.7 -Release: 2%{?dist} -Summary: Open Source Apple Filing Protocol(AFP) fileserver -License: GPLv2+ -URL: http://netatalk.sourceforge.net/ -Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 -Source1: netatalk.pam-system-auth -# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm -Patch0: netatalk-3.0.1-basedir.patch -# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS -Patch1: netatalk-3.1.7-autotools.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_mysql} -BuildRequires: mysql-devel -%endif -%if 0%{?with_openafs} -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. A *NIX/*BSD -system running Netatalk is capable of serving many Macintosh clients -simultaneously as an AppleShare file server (AFP). - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q -rm -frv libevent/ -%patch0 -p1 -%patch1 -p1 - -# Avoid re-running the autotools -touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 - -# fix permissions -find include ( -name '*.h' -a -executable ) -exec chmod -x {} ; - -%build -%ifarch ppc ppc64 s390 s390x -export CFLAGS="$CFLAGS -fsigned-char" -%endif - -%configure \ - --localstatedir=%{_localstatedir}/lib \ -%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 -%make_install -# Ghost lock dir. -mkdir -p %{buildroot}/var/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 -/sbin/ldconfig - -%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 -fi -%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 -/sbin/ldconfig - -%files -%doc AUTHORS CONTRIBUTORS NEWS -%license COPYING COPYRIGHT -%doc doc/manual/*.html -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf -%dir %{_sysconfdir}/netatalk -%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 -%{_bindir}/* -%exclude %{_bindir}/netatalk-config -%{_libdir}/atalk/ -%{_libdir}/libatalk.so.* -%{_mandir}/man*/* -%exclude %{_mandir}/man*/netatalk-config* -%{_sbindir}/* -%if 0%{?with_systemd} -%{_unitdir}/netatalk.service -%else -%{_initrddir}/netatalk -%endif -%ghost %dir /var/lock/netatalk -%{_localstatedir}/lib - -%files devel -%{_bindir}/netatalk-config -%{_datadir}/aclocal/netatalk.m4 -%{_includedir}/atalk/ -%{_libdir}/libatalk.so -%{_mandir}/man*/netatalk-config.1* - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 5:3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 -- Increment epoch. Missed to reset %%release in previous change. - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-7 -- Upstream update to 3.1.7 (RHBZ#1134783). -- Remove doc from *-devel. -- Add %%license. -- Update %%description from - http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. - -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 -- Address F23FTBFS, RHBZ#1239711: - - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, - netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, - netatalk-2.2.3-sigterm.patch (Unused) - - Add netatalk-3.0.1-basedir.patch. - - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - - Fix permissions on include-files. - - Remove duplicate %%global with_mysql. - - Enable dbus. - - Add missing "fi" in %%preun. - - Run /sbin/ldconfig in %%postun, %%preun. - - Reflect /var/lock/netatalk is hard-coded into the sources. - - Set --localstatedir=/var/lib (/var/netatalk violates FHS). - -* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 04 2014 Christopher Meng rpm@cicku.me - 4:3.1.3-1 -- Update to 3.1.3 - -* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 -- Rebuild for new libgcrypt - -* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 -- Perl 5.18 rebuild - -* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 -- Scriptlets replaced with new systemd macros - -* Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 -- fixed build issue on f18 - -* Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 -- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX - client, crashes Finder netatalk-2.2.2-1 - -* Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 -- fixes: #831001 - netatalk pam configuration has invalid entry - -* Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 -- fixes #828205 - update to latest upstream netatalk-2.2.3 - -* Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 -- fixes #782049 - update to latest upstream netatalk-2.2.2 - -* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 -- fixes #501144 - updated and redirected pam config - -* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 -- update to latest upstream netatalk-2.2.1 - -* Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 -- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel - -* Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 -- fixed missing epoch in sysvinit subpackage and triggers - -* Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 -- fixes #714448 - systemd-service -- moves SysV initscript to subpackage - -* Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 -- update to latest upstream netatalk-2.2.0 - -* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 -- updated to latest upstream version netatalk-2.1.5 - -* Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 -- updated to latest upstream version - -* Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 -- updated to latest upstream version -- added license texts to devel subpackage - -* Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 -- updated to latest upstream version - -* Fri May 28 2010 Jiri Skala jskala@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@redhat.com - 4:2.1-1 -- updated to latest upstream version - -* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 -- oops forgot upload new sources => shifted release number - -* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 -- updated to latest upstream version - -* Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 -- added BuildRequires: ... libgcrypt-devel -- removed outdated atalk.init - -* Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 -- fixed #473943 - -* Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 -- rebuilt with new openssl - -* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 -- updated to latest upstream version - -* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 -- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability - -* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:2.0.3-25 -- fixed epoch in the subpackage requires - -* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:2.0.3-24 -- fix #473186 conflict timeout with coreutils - -* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 -- rebuild with new openssl - -* Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 -- fix #473939 netatalk-2.0.3-21.fc10 disable quota - -* Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 -- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches - -* Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 -- fix license tag - -* Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 -- fix chmod o+x (#225085) -- increase the maximum number of cnid_dbd processes to 512 (#232805) -- papd now writes debugging output to stderr when invoked with -d (#150021) -- fix multiarch conflict for netatalk-devel (#342681) - -* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 -- make init script LSB compliant (#246993) - -* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 -- fix unowned directories (#233889) - -* Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 -- rebuild for gcc-4.3 - -* Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 -- rebuild - -* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 -- patch to build on FC, bad open call - -* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 -- rebuild - -* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 -- Rebuild for selinux ppc32 issue. - -* Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 -- fix from merge review -- Resolves #226190 - -* Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 -- fix fiew problems in spec - -* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 -- rebuild against new db4 - -* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 -- BuildRequires changed from cracklib to cracklib-devel - -* Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 -- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* - (#203001) -- Add dist tag - -* Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 -- rebuild - -* Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 -- rebuild for broken libgssapi deps and brew build - -* Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com -- rebuild for new gcc, glibc, glibc-kernheaders - -* Fri Dec 09 2005 Jesse Keating jkeating@redhat.com -- rebuilt - -* Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com -- Rebuild for new openssl dependencies - -* Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com -- use include instead of pam_stack in pam config - -* Wed Jul 20 2005 Bill Nottingham notting@redhat.com -- don't run by default - -* Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com -- Upgrade to upstream version 2.0.3 -- fix bug 160486: use netatalk's initscript - -* Wed Mar 30 2005 Florian La Roche laroche@redhat.com -- quick fix: rm -f /usr/include/netatalk/at.h until this - is resolved the correct way - -* Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com -- Fix for gcc4 compilation: extern_ucreator.patch - -* Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com -- Upgraded to upstream version 2.0.2 . - -* Tue Jun 15 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Tue Mar 02 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Fri Feb 13 2004 Elliot Lee sopwith@redhat.com -- rebuilt - -* Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de -- 1.6.4 - -* Fri Aug 1 2003 Charlie Bennett ccb@redhat.com -- Update with 1.6.3 upstream sources - -* Tue Jul 29 2003 Elliot Lee sopwith@redhat.com -- Rebuild -- Fix perl multilib path editing -- Add pathcat patch - -* Thu May 1 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 -- Make multilib generic -- Add builddep on quota (for rpcsvc/rquota.h) - -* Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 -- fix initscript error (#82118) - -* Wed Jan 22 2003 Tim Powers timp@redhat.com -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 -- patch for compile errors with new ssl libs -- rebuildfedora - -* Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de -- postun should never fail - -* Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 -- Updated to 1.5.5 - -* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) -- Fixed missing /usr/share/netatalk dir (#67222) - -* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 -- automated rebuild - -* Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 -- Updated to latest version 1.5.3.1. -- Fixed bug for nls file lookup (#66300). - -* Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 -- Fixed initscript bug where you can't use blanks inside of names (#64926). - -* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-3 -- Fixed initscript to use correct config files from /etc/atalk (#62803) -- Changed initscript to use $0 instead of direct string (#61734) -- Change Copyright to Licencse and switch from BSD to GPL (#61746) - -* Thu Mar 14 2002 Bill Nottingham notting@redhat.com -- don't run by default - -* Wed Mar 13 2002 Bill Nottingham notting@redhat.com -- it's back - -* Fri Mar 2 2001 Tim Powers timp@redhat.com -- rebuilt against openssl-0.9.6-1 - -* Sun Feb 25 2001 Tim Powers timp@redhat.com -- fixed bug 29370. This package is trying to include a file glibc already includes - -* Tue Jan 23 2001 Tim Powers timp@redhat.com -- updated initscript - -* Thu Jan 04 2001 Than Ngo than@redhat.com -- fixed uams-path -- added noreplace to %%config - -* Mon Nov 20 2000 Tim Powers timp@redhat.com -- rebuilt to fix bad dir perms - -* Fri Nov 10 2000 Than Ngo than@redhat.com -- update to 1.5pre2 (bug #19737, #20397) -- update Url and ftp site -- clean up specfile -- netatalk-1.4b2+asun obsolete - -* Mon Aug 07 2000 Than Ngo than@redhat.de -- fix dependency with glibc-devel (Bug #15589) -- fix typo in description (Bug #15479) - -* Wed Aug 2 2000 Tim Powers timp@redhat.com -- fix symlinks not being relative. - -* Fri Jul 28 2000 Than Ngo than@redhat.de -- add missing restart function in startup script - -* Fri Jul 28 2000 Tim Powers timp@redhat.com -- fixed initscripts so that condrestart doesn't return 1 when the test fails - -* Mon Jul 24 2000 Prospector prospector@redhat.com -- rebuilt - -* Sun Jul 23 2000 Tim Powers timp@redhat.com -- rebuilt - -* Mon Jul 17 2000 Tim Powers timp@redhat.com -- inits back to rc.d/init.d, using service to start inits - -* Wed Jul 12 2000 Than Ngo than@redhat.de -- rebuilt - -* Thu Jul 06 2000 Tim Powers timp@redhat.com -- fixed broken PreReq, now PreReq's /etc/init.d - -* Tue Jun 27 2000 Than Ngo than@redhat.de -- remove prereq initscripts, add requires initscripts -- clean up specfile - -* Mon Jun 26 2000 Than Ngo than@redhat.de -- /etc/rc.d/init.d -> /etc/init.d -- add condrestart directive -- fix post/preun/postun scripts -- prereq initscripts >= 5.20 - -* Tue Jun 20 2000 Tim Powers timp@redhat.com -- fixed bug 11420 concerning the building with -O2. - -* Thu Jun 8 2000 Tim Powers timp@redhat.com -- fix bug #11978 -- fix man page locations to be FHS compliant - -* Thu Jun 1 2000 Nalin Dahyabhai nalin@redhat.com -- modify PAM setup to use system-auth - -* Thu Dec 16 1999 Tim Powers timp@redhat.com -- renewed source so it is pristine, delete the problematic files in spec file - instead -- general spec file cleanups, create buildroot and dirs in the %%install - section -- strip binaries -- gzip man pages -- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too -- changed group -- added %%defattr to %%files section - -* Tue Aug 3 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp -- Change Copyright tag to BSD. - Add /usr/bin/adv1tov2. - -* Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp -- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. - -* Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp -- [asun2.1.3] - -* Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-8] - -* Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-6] - -* Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- [pre-asun2.1.2-3] - -* Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.1-3 source. - -* Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.1-2 source. - -* Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Fix rcX.d's symbolic links. - -* Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. - -* Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-10a source. - -* Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-8 source. Add chkconfig support. - -* Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Comment out -DCRLF. Use RPM_OPT_FLAGS. - -* Tue Sep 8 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. - -* Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-6 source. - -* Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0-5 source. - -* Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp -- Use pre-asun2.1.0-3 source. - -* Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Add afpovertcp entries to /etc/services -- Remove BuildRoot in man8 pages - -* Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun - asun@saul9.u.washington.edu to provide an AppleShareIP file server - -- Included AppleVolumes.system file maintained by Johnson - johnson@stpt.usf.edu - -* Mon Aug 25 1997 David Gibson D.Gibson@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@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. -- 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@zorak.gsfc.nasa.gov -- Updated for /etc/pam.d diff --git a/sources b/sources deleted file mode 100644 index b8bf15d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2
commit 45a0be55a701cfac4fa58d758147a8562994f420 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Feb 4 09:13:56 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index affca66..65977c9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 5 Version: 3.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -258,6 +258,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 - Increment epoch. Missed to reset %%release in previous change.
commit 96fd82a7380b100bd6e5cfebfef1c1cc56e7b663 Author: Ralf Corspius corsepiu@fedoraproject.org Date: Thu Jul 23 16:21:24 2015 +0200
Increment epoch. Missed to reset %release in previous change.
diff --git a/netatalk.spec b/netatalk.spec index 5ae250f..affca66 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -33,9 +33,9 @@ %global with_tracker 1
Name: netatalk -Epoch: 4 +Epoch: 5 Version: 3.1.7 -Release: 7%{?dist} +Release: 1%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -258,7 +258,10 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog -* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-1 +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-7 - Upstream update to 3.1.7 (RHBZ#1134783). - Remove doc from *-devel. - Add %%license.
commit 1ea175cb2a2ee54ca5d2a2bbee3f173df26c68d4 Author: Ralf Corspius corsepiu@fedoraproject.org Date: Thu Jul 23 15:41:22 2015 +0200
Upstream update to 3.1.7 (RHBZ#1134783).
- Remove doc from *-devel. - Add %license. - Update %description from http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm.
diff --git a/.gitignore b/.gitignore index 7ab92b6..8302d47 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/netatalk-3.1.3.tar.bz2 +/netatalk-3.1.7.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 597c49b..5ae250f 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -22,7 +22,7 @@
%global with_quota 1
-%if 0%{?fedora} >= 15 || 0%{?el} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_systemd 1 %else %global with_systemd 0 @@ -34,8 +34,8 @@
Name: netatalk Epoch: 4 -Version: 3.1.3 -Release: 4%{?dist} +Version: 3.1.7 +Release: 7%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -113,12 +113,9 @@ Requires(postun): initscripts %endif
%description -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. +Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP).
%package devel Summary: Development files for %{name} @@ -229,7 +226,8 @@ fi /sbin/ldconfig
%files -%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS +%doc AUTHORS CONTRIBUTORS NEWS +%license COPYING COPYRIGHT %doc doc/manual/*.html %config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf %dir %{_sysconfdir}/netatalk @@ -253,7 +251,6 @@ fi %{_localstatedir}/lib
%files devel -%doc COPYRIGHT COPYING %{_bindir}/netatalk-config %{_datadir}/aclocal/netatalk.m4 %{_includedir}/atalk/ @@ -261,6 +258,13 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.7-1 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + * Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 - Address F23FTBFS, RHBZ#1239711: - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). diff --git a/sources b/sources index 4844848..b8bf15d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac65dafa20d502a10438fec7e1116b1e netatalk-3.1.3.tar.bz2 +831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2
commit 04b28517537b7923508d213e0539a8ccf30ea312 Author: Ralf Corspius corsepiu@fedoraproject.org Date: Thu Jul 23 15:23:54 2015 +0200
Address F23FTBFS, RHBZ#1239711:
- Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, netatalk-2.2.3-sigterm.patch (Unused) - Add netatalk-3.0.1-basedir.patch. - Mark %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - Fix permissions on include-files. - Remove duplicate %global with_mysql. - Enable dbus. - Add missing "fi" in %preun. - Run /sbin/ldconfig in %postun, %preun. - Reflect /var/lock/netatalk is hard-coded into the sources. - Set --localstatedir=/var/lib (/var/netatalk violates FHS).
diff --git a/.gitignore b/.gitignore index 1b00f6f..7ab92b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -netatalk-2.1.3.tar.bz2 -/netatalk-2.1.4.tar.bz2 -/netatalk-2.1.5.tar.bz2 -/netatalk-2.2.0.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/ICDumpSuffixMap b/ICDumpSuffixMap deleted file mode 100644 index 3a8283f..0000000 --- a/ICDumpSuffixMap +++ /dev/null @@ -1 +0,0 @@ -#!perl # # ICDumpMap # --- Dump suffix mappings from your Internet Config extension. # # iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp #
use Mac::InternetConfig;
open MAP, ">AppleVolumes"; printf MAP "%-9s "%4s" "%4s" %-30s %-25s %-15s\n\n", ".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain"; print MAP "# The following lines are extracted from Internet Config Preference.\n\n"; for my $entry (keys %InternetConfigMap) { next unless $entry->extension =~ /^./; $_ = sprintf "%-9s "%4s" "%4s" %-30s %-25s %-15s", $entry->extension, $entry->file_type, $entry->file_creator, $entry->entry_name, $entry->creator_app_name, $entry->MIME_type; s/\s*$/\n/; print MAP; } close MAP; \ No newline at end of file diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch deleted file mode 100644 index c41c66f..0000000 --- a/netatalk-2.0.2-uams_no_pie.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie netatalk-2.0.3/etc/uams/Makefile.am ---- netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 -+++ netatalk-2.0.3/etc/uams/Makefile.am 2008-10-10 10:32:59.000000000 +0200 -@@ -1,5 +1,5 @@ - # Makefile.am for etc/uams/ -- -+LDFLAGS = - SUBDIRS = uams_krb4 - - # -diff -up netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie netatalk-2.0.3/macros/gssapi-check.m4 ---- netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 -+++ netatalk-2.0.3/macros/gssapi-check.m4 2008-10-10 10:32:59.000000000 +0200 -@@ -126,7 +126,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK], - if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then - AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) - AC_MSG_RESULT([yes]) -- GSSAPI_LIBS="$LDFLAGS $LIBS" -+ GSSAPI_LIBS="$LIBS" - else - AC_MSG_RESULT([no]) - if test x"$compilegssapi" = x"yes"; then diff --git a/netatalk-2.0.4-extern_ucreator.patch b/netatalk-2.0.4-extern_ucreator.patch deleted file mode 100644 index 413ac08..0000000 --- a/netatalk-2.0.4-extern_ucreator.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.4/etc/afpd/desktop.c ---- netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator 2009-07-14 16:26:36.984610055 +0200 -+++ netatalk-2.0.4/etc/afpd/desktop.c 2009-07-14 16:27:01.607580009 +0200 -@@ -312,7 +312,7 @@ addicon_err: - } - - static const u_char utag[] = { 0, 0, 0, 0 }; --static const u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ -+u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ - static const u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ - static const short usize = 256; - diff --git a/netatalk-2.2.3-libdb4.patch b/netatalk-2.2.3-libdb4.patch deleted file mode 100644 index 0b5ea4c..0000000 --- a/netatalk-2.2.3-libdb4.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure b/configure -index eb879af..0e5b407 100755 ---- a/configure -+++ b/configure -@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local /usr" -- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" -+ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" - - bdbfound=no - savedcflags="$CFLAGS" -diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c -index 6a818a3..bad57e7 100644 ---- a/etc/cnid_dbd/dbd_add.c -+++ b/etc/cnid_dbd/dbd_add.c -@@ -24,7 +24,7 @@ - #include <atalk/cnid_dbd_private.h> - #include <atalk/cnid.h> - #ifdef HAVE_DB4_DB_H --#include <db4/db.h> -+#include <libdb4/db.h> - #else - #include <db.h> - #endif -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 2cc59cb..ef58e15 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -87,7 +87,7 @@ AC_DEFUN([AC_PATH_BDB],[ - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local /usr" -- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" -+ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" - - bdbfound=no - savedcflags="$CFLAGS" diff --git a/netatalk-2.2.3-sigterm.patch b/netatalk-2.2.3-sigterm.patch deleted file mode 100644 index 169a0d6..0000000 --- a/netatalk-2.2.3-sigterm.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 25e03ec9edd863136008881a4a57ea9a788d34b3 Mon Sep 17 00:00:00 2001 -From: Frank Lahm franklahm@googlemail.com -Date: Mon, 18 Jun 2012 16:26:28 +0200 -Subject: [PATCH] Block SIGTERM when calling pam_close_session - ---- - etc/afpd/afp_dsi.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c -index bf454e1..6c6bc7d 100644 ---- a/etc/afpd/afp_dsi.c -+++ b/etc/afpd/afp_dsi.c -@@ -80,7 +80,8 @@ static sigjmp_buf recon_jmp; - static void afp_dsi_close(AFPObj *obj) - { - DSI *dsi = obj->handle; -- -+ sigset_t sigs; -+ - close(obj->ipc_fd); - obj->ipc_fd = -1; - -@@ -97,8 +98,14 @@ static void afp_dsi_close(AFPObj *obj) - } - - close_all_vol(); -- if (obj->logout) -+ -+ if (obj->logout) { -+ /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ -+ pthread_sigmask(SIG_BLOCK, &sigs, NULL); -+ sigemptyset(&sigs); -+ sigaddset(&sigs, SIGTERM); - (*obj->logout)(); -+ } - - LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", - dsi->read_count/1024.0, dsi->write_count/1024.0); --- -1.7.4.1 - -From d8f375c4fbff7a27768ce6efebec64ab193734ee Mon Sep 17 00:00:00 2001 -From: Frank Lahm franklahm@googlemail.com -Date: Wed, 20 Jun 2012 15:33:26 +0200 -Subject: [PATCH] Fix signal blocking, pthread_sigmask was called before mask initialisation. Also block all sigs instead of only SIGTERM (think I saw SIGHUP somewhere). - ---- - etc/afpd/afp_dsi.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c -index 6c6bc7d..7779b23 100644 ---- a/etc/afpd/afp_dsi.c -+++ b/etc/afpd/afp_dsi.c -@@ -100,10 +100,9 @@ static void afp_dsi_close(AFPObj *obj) - close_all_vol(); - - if (obj->logout) { -- /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ -+ /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ -+ sigfillset(&sigs); - pthread_sigmask(SIG_BLOCK, &sigs, NULL); -- sigemptyset(&sigs); -- sigaddset(&sigs, SIGTERM); - (*obj->logout)(); - } - --- -1.7.4.1 - diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch new file mode 100644 index 0000000..e4b8b28 --- /dev/null +++ b/netatalk-3.1.7-autotools.patch @@ -0,0 +1,50 @@ +diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure +--- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 ++++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 +@@ -17226,8 +17226,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 + $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} + fi +@@ -17382,8 +17382,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" + if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : + +diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 +--- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 ++++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 +@@ -18,8 +18,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) + fi + +@@ -64,8 +64,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) + + # Heimdal/MIT compatibility fix diff --git a/netatalk.spec b/netatalk.spec index c7e77a6..597c49b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -12,9 +12,9 @@
%global with_docbook 1
-%global with_dtrace 1 +%global with_dbus 1
-%global with_mysql 1 +%global with_dtrace 1
%global with_mysql 1
@@ -35,13 +35,17 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: netatalk.pam-system-auth -#Patch2: netatalk-2.0.4-extern_ucreator.patch +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS +Patch1: netatalk-3.1.7-autotools.patch + BuildRequires: avahi-devel BuildRequires: bison %if 0%{?with_cracklib} @@ -127,7 +131,14 @@ developing applications that use %{name}. %prep %setup -q rm -frv libevent/ -#patch2 -p1 -b .extern_ucreator +%patch0 -p1 +%patch1 -p1 + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include ( -name '*.h' -a -executable ) -exec chmod -x {} ;
%build %ifarch ppc ppc64 s390 s390x @@ -135,6 +146,7 @@ export CFLAGS="$CFLAGS -fsigned-char" %endif
%configure \ + --localstatedir=%{_localstatedir}/lib \ %if 0%{?with_acls} --with-acl \ %endif @@ -179,7 +191,7 @@ make -C doc/manual html-local %install %make_install # Ghost lock dir. -mkdir -p %{buildroot}%{_localstatedir}/lock/netatalk +mkdir -p %{buildroot}/var/lock/netatalk # Use specific pam conf. install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk
@@ -194,6 +206,7 @@ sh test/afpd/test.sh %else chkconfig --add netatalk %endif +/sbin/ldconfig
%preun %if 0%{?with_systemd} @@ -202,6 +215,7 @@ chkconfig --add netatalk if [ $1 -eq 0 ] ; then service netatalk stop &> /dev/null chkconfig --del netatalk &> /dev/null +fi %endif
%postun @@ -212,11 +226,12 @@ if [ "$1" -ge "1" ] ; then service netatalk condrestart >/dev/null 2>&1 || : fi %endif +/sbin/ldconfig
%files %doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS %doc doc/manual/*.html -%config %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf %dir %{_sysconfdir}/netatalk %config(noreplace) %{_sysconfdir}/netatalk/afp.conf %config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf @@ -234,8 +249,8 @@ fi %else %{_initrddir}/netatalk %endif -%ghost %dir %{_localstatedir}/lock/netatalk -%{_localstatedir}/netatalk/ +%ghost %dir /var/lock/netatalk +%{_localstatedir}/lib
%files devel %doc COPYRIGHT COPYING @@ -246,6 +261,22 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Jul 23 2015 Ralf Corspius corsepiu@fedoraproject.org - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + * Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 43215bb9cebba6e23cae056673e2b1b4bb177659 Author: Dennis Gilmore dennis@ausil.us Date: Wed Jun 17 21:39:27 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 377dca4..c7e77a6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -246,6 +246,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit b08b13d4c3607b5b6cb1c69c3964e401f7958c2b Author: Peter Robinson pbrobinson@fedoraproject.org Date: Sun Aug 17 11:29:35 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 89cfd44..377dca4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -246,6 +246,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 04 2014 Christopher Meng rpm@cicku.me - 4:3.1.3-1 - Update to 3.1.3
commit 819aa9faf58105cd8ca5fc6bba14bf5ac7939fd5 Author: Christopher Meng i@cicku.me Date: Sat Jul 5 12:16:17 2014 +0800
Fix wrong conditional line.
diff --git a/netatalk.spec b/netatalk.spec index 2a7e066..89cfd44 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -68,10 +68,10 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt %endif BuildRequires: krb5-devel -%if 0%{?with_openafs} %if 0%{?with_mysql} BuildRequires: mysql-devel %endif +%if 0%{?with_openafs} BuildRequires: openafs-devel %endif %if 0%{?with_ldap}
commit f6bbe96ceec5c44fc92909c882f9521be4a295ff Author: Christopher Meng i@cicku.me Date: Sat Jul 5 11:41:26 2014 +0800
Update to 3.1.3
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-%%7Bversion%7D.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-%%7Bversion%7D.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@cicku.me - 4:3.1.3-1 +- Update to 3.1.3 + * Sat Jun 07 2014 Fedora Release Engineering rel-eng@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@redhat.com - 4:2.0.3-9 - rebuild against new db4
-* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 +* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 - BuildRequires changed from cracklib to cracklib-devel
* Fri Aug 18 2006 Jesse Keating jkeating@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@redhat.com 1.5.5-5 +* Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 - fix initscript error (#82118)
* Wed Jan 22 2003 Tim Powers timp@redhat.com @@ -410,7 +494,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jan 7 2003 Nalin Dahyabhai nalin@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@redhat.de - postun should never fail @@ -515,9 +599,9 @@ rm -rf $RPM_BUILD_ROOT
* Thu Dec 16 1999 Tim Powers timp@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@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@ma.ns.musashi-tech.ac.jp - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. + * Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp - Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + * Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp - [asun2.1.3] + * Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-8] + * Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-6] + * Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-3] + * Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.1-3 source. + * Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.1-2 source. + * Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Fix rcX.d's symbolic links. + * Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + * Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-10a source. -* Thu Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp + +* Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-8 source. Add chkconfig support. + * Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Comment out -DCRLF. Use RPM_OPT_FLAGS. -* Mon Sep 8 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp + +* Tue Sep 8 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp + +* Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-6 source. + * Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-5 source. + * Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp - Use pre-asun2.1.0-3 source. + * Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Add afpovertcp entries to /etc/services - Remove BuildRoot in man8 pages + * Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun asun@saul9.u.washington.edu to provide an AppleShareIP file server + - Included AppleVolumes.system file maintained by Johnson johnson@stpt.usf.edu + * Mon Aug 25 1997 David Gibson D.Gibson@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@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@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
commit 42ca9a6a874581969736fb1a5963308b6d2cc027 Author: Dennis Gilmore dennis@ausil.us Date: Sat Jun 7 07:27:27 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 0ba1aa2..0b34b13 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 10%{?dist} +Release: 11%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1*
%changelog +* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 - Rebuild for new libgcrypt
commit 6f9793cbd0346a9a079cb64bd0fdbd9d7bd0eae1 Author: Tomas Mraz tmraz@fedoraproject.org Date: Thu Apr 24 16:56:24 2014 +0200
Rebuild for new libgcrypt
diff --git a/netatalk.spec b/netatalk.spec index decbec0..0ba1aa2 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 9%{?dist} +Release: 10%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Apr 24 2014 Tom Mrz tmraz@redhat.com - 4:2.2.3-10 +- Rebuild for new libgcrypt + * Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit 109a7afa1d12e8d233646e553583de2268919f03 Author: Dennis Gilmore dennis@ausil.us Date: Sat Aug 3 08:02:39 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 8fb1a96..decbec0 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 8%{?dist} +Release: 9%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1*
%changelog +* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 - Perl 5.18 rebuild
commit 368d9522286eedd857a8cae836ee7f61f9e633b4 Author: Petr Psa ppisar@redhat.com Date: Wed Jul 17 23:43:31 2013 +0200
Perl 5.18 rebuild
diff --git a/netatalk.spec b/netatalk.spec index be03d54..8fb1a96 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 7%{?dist} +Release: 8%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Jul 17 2013 Petr Pisar ppisar@redhat.com - 4:2.2.3-8 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit fc3b1bd567347eaa12ba1c1fb2f721fa6c422340 Author: Dennis Gilmore dennis@ausil.us Date: Thu Feb 14 02:08:18 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index c03d9c5..be03d54 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 6%{?dist} +Release: 7%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 - Scriptlets replaced with new systemd macros
commit 39e3953a75aeeda738039845b0e827e805ca0114 Author: Lukas Nykryn lnykryn@redhat.com Date: Thu Aug 23 13:07:42 2012 +0200
Scriptlets replaced with new systemd macros
diff --git a/netatalk.spec b/netatalk.spec index 3691133..c03d9c5 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 5%{?dist} +Release: 6%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -15,8 +15,9 @@ Patch4: netatalk-2.2.3-libdb4.patch
Url: http://netatalk.sourceforge.net/ Requires: pam -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig +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 @@ -119,16 +120,13 @@ find $RPM_BUILD_ROOT -name *.la -exec rm {} ; rm -rf $RPM_BUILD_ROOT
%post -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_post netatalk.service
%preun -if [ "$1" = "0" ] ; then - /bin/systemctl disable netatalk.service > /dev/null 2>&1 || : - /bin/systemctl stop netatalk.service > /dev/null 2>&1 || : -fi +%systemd_preun netatalk.service
%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun_with_restart netatalk.service
%files %defattr(-,root,root) @@ -167,6 +165,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Aug 23 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + * Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 - fixed build issue on f18
commit 25a50317ec91a76a4be1dc4d784fdacffe54a4a1 Author: Luk Nykrn lnykryn@redhat.com Date: Fri Jul 27 13:45:06 2012 +0200
fix build on f18
diff --git a/netatalk-2.2.3-libdb4.patch b/netatalk-2.2.3-libdb4.patch new file mode 100644 index 0000000..0b5ea4c --- /dev/null +++ b/netatalk-2.2.3-libdb4.patch @@ -0,0 +1,39 @@ +diff --git a/configure b/configure +index eb879af..0e5b407 100755 +--- a/configure ++++ b/configure +@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local /usr" +- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" ++ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" + + bdbfound=no + savedcflags="$CFLAGS" +diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c +index 6a818a3..bad57e7 100644 +--- a/etc/cnid_dbd/dbd_add.c ++++ b/etc/cnid_dbd/dbd_add.c +@@ -24,7 +24,7 @@ + #include <atalk/cnid_dbd_private.h> + #include <atalk/cnid.h> + #ifdef HAVE_DB4_DB_H +-#include <db4/db.h> ++#include <libdb4/db.h> + #else + #include <db.h> + #endif +diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 +index 2cc59cb..ef58e15 100644 +--- a/macros/db3-check.m4 ++++ b/macros/db3-check.m4 +@@ -87,7 +87,7 @@ AC_DEFUN([AC_PATH_BDB],[ + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local /usr" +- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" ++ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" + + bdbfound=no + savedcflags="$CFLAGS" diff --git a/netatalk.spec b/netatalk.spec index 2b06b8b..3691133 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 4%{?dist} +Release: 5%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -11,6 +11,7 @@ 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 @@ -43,6 +44,7 @@ programs. %patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator %patch3 -p1 -b .sigterm +%patch4 -p1 -b .libdb4
ln -s ./NEWS ChangeLog
@@ -165,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Jul 27 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-5 +- fixed build issue on f18 + * Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit 55bfdb9198a115cc627ba71412537960df81e141 Author: Dennis Gilmore dennis@ausil.us Date: Thu Jul 19 23:24:51 2012 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 9fcf826..2b06b8b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Jul 20 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 - fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX client, crashes Finder netatalk-2.2.2-1
commit 092fa181bcb6707ad9f963e4919be030fa377c31 Author: Lukas Nykryn lnykryn@redhat.com Date: Mon Jul 16 13:21:23 2012 +0200
fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share
diff --git a/netatalk-2.2.3-sigterm.patch b/netatalk-2.2.3-sigterm.patch new file mode 100644 index 0000000..169a0d6 --- /dev/null +++ b/netatalk-2.2.3-sigterm.patch @@ -0,0 +1,71 @@ +From 25e03ec9edd863136008881a4a57ea9a788d34b3 Mon Sep 17 00:00:00 2001 +From: Frank Lahm franklahm@googlemail.com +Date: Mon, 18 Jun 2012 16:26:28 +0200 +Subject: [PATCH] Block SIGTERM when calling pam_close_session + +--- + etc/afpd/afp_dsi.c | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c +index bf454e1..6c6bc7d 100644 +--- a/etc/afpd/afp_dsi.c ++++ b/etc/afpd/afp_dsi.c +@@ -80,7 +80,8 @@ static sigjmp_buf recon_jmp; + static void afp_dsi_close(AFPObj *obj) + { + DSI *dsi = obj->handle; +- ++ sigset_t sigs; ++ + close(obj->ipc_fd); + obj->ipc_fd = -1; + +@@ -97,8 +98,14 @@ static void afp_dsi_close(AFPObj *obj) + } + + close_all_vol(); +- if (obj->logout) ++ ++ if (obj->logout) { ++ /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ ++ pthread_sigmask(SIG_BLOCK, &sigs, NULL); ++ sigemptyset(&sigs); ++ sigaddset(&sigs, SIGTERM); + (*obj->logout)(); ++ } + + LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", + dsi->read_count/1024.0, dsi->write_count/1024.0); +-- +1.7.4.1 + +From d8f375c4fbff7a27768ce6efebec64ab193734ee Mon Sep 17 00:00:00 2001 +From: Frank Lahm franklahm@googlemail.com +Date: Wed, 20 Jun 2012 15:33:26 +0200 +Subject: [PATCH] Fix signal blocking, pthread_sigmask was called before mask initialisation. Also block all sigs instead of only SIGTERM (think I saw SIGHUP somewhere). + +--- + etc/afpd/afp_dsi.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c +index 6c6bc7d..7779b23 100644 +--- a/etc/afpd/afp_dsi.c ++++ b/etc/afpd/afp_dsi.c +@@ -100,10 +100,9 @@ static void afp_dsi_close(AFPObj *obj) + close_all_vol(); + + if (obj->logout) { +- /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ ++ /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ ++ sigfillset(&sigs); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); +- sigemptyset(&sigs); +- sigaddset(&sigs, SIGTERM); + (*obj->logout)(); + } + +-- +1.7.4.1 + diff --git a/netatalk.spec b/netatalk.spec index fb0580e..9fcf826 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -10,6 +10,7 @@ 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
Url: http://netatalk.sourceforge.net/ Requires: pam @@ -41,6 +42,7 @@ programs.
%patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator +%patch3 -p1 -b .sigterm
ln -s ./NEWS ChangeLog
@@ -163,6 +165,10 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Jul 16 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + * Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 - fixes: #831001 - netatalk pam configuration has invalid entry
commit b3a83953ce95fa034709b76157e2210c808dab87 Author: Lukas Nykryn lnykryn@redhat.com Date: Tue Jun 12 09:19:27 2012 +0200
fixes: #831001 - netatalk pam configuration has invalid entry
diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth index c6bc86d..2c0c0b2 100644 --- a/netatalk.pam-system-auth +++ b/netatalk.pam-system-auth @@ -8,8 +8,7 @@ password include system-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the -user context +# pam_selinux.so open should only be followed by sessions to be executed in the user context session required pam_selinux.so open session required pam_namespace.so session optional pam_keyinit.so force revoke diff --git a/netatalk.spec b/netatalk.spec index b500fca..fb0580e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Jun 12 2012 Luk Nykrn lnykryn@redhat.com - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + * Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 - fixes #828205 - update to latest upstream netatalk-2.2.3
commit 9885a61e7bc2b3c6e23d0207f57066338db43514 Author: Lukas Nykryn lnykryn@redhat.com Date: Mon Jun 4 15:05:07 2012 +0200
fixes #828205 - update to latest upstream netatalk-2.2.3
diff --git a/.gitignore b/.gitignore index f89119f..e61d96b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.2.0.tar.bz2 /netatalk-2.2.1.tar.bz2 /netatalk-2.2.2.tar.bz2 +/netatalk-2.2.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index f7a0758..b500fca 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ 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.2 +Version: 2.2.3 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Jun 04 2012 Lukas Nykryn lnykryn@redhat.com 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + * Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 - fixes #782049 - update to latest upstream netatalk-2.2.2
diff --git a/sources b/sources index dd71949..acc09ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd42b686ec7209d9ab47bd8e2e2431c4 netatalk-2.2.2.tar.bz2 +0b5a0645836183b0e548ccfbd5c022f8 netatalk-2.2.3.tar.bz2
commit c1fd6534862cb7d67364222bd68be3a889305a3c Author: Jiri Skala jskala@redhat.com Date: Mon Jan 16 14:40:34 2012 +0100
fixes #782049 - update to latest upstream netatalk-2.2.2
diff --git a/.gitignore b/.gitignore index d5a308d..f89119f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.5.tar.bz2 /netatalk-2.2.0.tar.bz2 /netatalk-2.2.1.tar.bz2 +/netatalk-2.2.2.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index aee5c2c..f7a0758 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Jan 16 2012 Jiri Skala jskala@redhat.com - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + * Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources index c84ee46..dd71949 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a371025daf96adb73fa491efdbfef28 netatalk-2.2.1.tar.bz2 +bd42b686ec7209d9ab47bd8e2e2431c4 netatalk-2.2.2.tar.bz2
commit 99ac03baaff0df8de3bafe409a40aff5ab41a103 Author: Dennis Gilmore dennis@ausil.us Date: Fri Jan 13 04:59:47 2012 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 2852ea9..aee5c2c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 - fixes #501144 - updated and redirected pam config
commit 5aa8bc7dd9686fb5f94775307a8d7ff347d0b836 Author: Jiri Skala jskala@redhat.com Date: Tue Nov 29 14:16:00 2011 +0100
fixes #501144 - updated and redirected pam config
diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth index 8147016..c6bc86d 100644 --- a/netatalk.pam-system-auth +++ b/netatalk.pam-system-auth @@ -1,10 +1,17 @@ -# /etc/pam.d/netatalk -# -# PAM configuration file for netatalk using system-auth substack -# (this would enable use of netatalk by LDAP or NIS users). -# +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so auth include system-auth account required pam_nologin.so account include system-auth password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the +user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke session include system-auth +session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec index 1fbae63..2852ea9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -102,7 +102,8 @@ 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
-cp -fp %{SOURCE2} config.example +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
@@ -162,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + * Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 - update to latest upstream netatalk-2.2.1
commit 09e84bc9ee408c53dab64c6951f7e7311573835c Author: Jiri Skala jskala@redhat.com Date: Tue Nov 29 13:34:08 2011 +0100
update to latest upstream netatalk-2.2.1
diff --git a/.gitignore b/.gitignore index 6013e57..d5a308d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 /netatalk-2.1.5.tar.bz2 /netatalk-2.2.0.tar.bz2 +/netatalk-2.2.1.tar.bz2 diff --git a/netatalk.service b/netatalk.service deleted file mode 100644 index 7e24a36..0000000 --- a/netatalk.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=File and Printer sharing via AppleTalk Protocol -After=syslog.target network.target - -[Service] -Type=oneshot -ExecStart=/bin/bash -c "exec /usr/libexec/netatalk/netatalk.sh" -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/netatalk.sh b/netatalk.sh deleted file mode 100755 index d16a1c3..0000000 --- a/netatalk.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -ATALK_BIN=/usr/bin -ATALK_CONF_DIR=/etc/netatalk/ -ATALK_SBIN=/usr/sbin - -# read in netatalk configuration -if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then - . ${ATALK_CONF_DIR}/netatalk.conf -fi - -if [ x"${ATALKD_RUN}" != x"no" -a -x ${ATALK_SBIN}/atalkd ]; then - ${ATALK_SBIN}/atalkd - - if [ x"${PAPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/papd ]; then - ${ATALK_SBIN}/papd - fi - - # check for timelord in bin directory - if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_BIN}/timelord ]; then - ${ATALK_BIN}/timelord - fi - - # check for timelord in sbin directory - if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/timelord ]; then - ${ATALK_SBIN}/timelord - fi - - # check for a2boot in bin directory - if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_BIN}/a2boot ]; then - ${ATALK_BIN}/a2boot - fi - - # check for a2boot in sbin directory - if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_SBIN}/a2boot ]; then - ${ATALK_SBIN}/a2boot - fi -fi - -if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ]; then - ${ATALK_SBIN}/cnid_metad $CNID_CONFIG -fi - -if [ x"${AFPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/afpd ]; then - ${ATALK_SBIN}/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ - -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}" -fi diff --git a/netatalk.spec b/netatalk.spec index 60ca3a4..1fbae63 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,14 +1,12 @@ 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.0 -Release: 4%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 -Source1: netatalk.service Source2: netatalk.pam-system-auth -Source3: netatalk.sh
Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch @@ -38,16 +36,6 @@ Group: Development/Libraries This package contains the header files for building Appletalk networking programs.
-%package sysvinit -Group: System Environment/Daemons -Summary: SysV initscript for netatalk -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires(preun): /sbin/service -Requires(postun): /sbin/service - -%description sysvinit -The netatalk-sysvinit contains SysV initscritps support. - %prep %setup -q
@@ -83,7 +71,7 @@ export CFLAGS="$CFLAGS -fsigned-char" --enable-krbV-uam \ --enable-overwrite \ --with-gnu-ld \ - --enable-redhat \ + --enable-redhat-systemd \ --with-libgcrypt
# Grrrr. Fix broken libtool/autoFOO Makefiles. @@ -118,11 +106,6 @@ cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system -mkdir -p $RPM_BUILD_ROOT/usr/libexec/netatalk -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/libexec/netatalk - # Clean up .a and .la files find $RPM_BUILD_ROOT -name *.a -exec rm {} ; find $RPM_BUILD_ROOT -name *.la -exec rm {} ; @@ -142,13 +125,6 @@ fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%triggerun -- %{name} < 4:2.2.0-2 - /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : - /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || : - -%triggerpostun -n %{name}-sysvinit -- %{name} < 4:2.2.0-2 - /sbin/chkconfig --add netatalk >/dev/null 2>&1 || : - %files %defattr(-,root,root) %doc COPYRIGHT COPYING ChangeLog VERSION NEWS @@ -185,10 +161,10 @@ fi %{_bindir}/netatalk-config %{_mandir}/man*/netatalk-config.1*
-%files sysvinit -%attr(755,root,root) %{_initrddir}/netatalk - %changelog +* Tue Nov 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + * Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 - fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel
diff --git a/sources b/sources index 0022dbd..c84ee46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acac2b5f2d9f43bfd5ea2a5cf4c71fe5 netatalk-2.2.0.tar.bz2 +4a371025daf96adb73fa491efdbfef28 netatalk-2.2.1.tar.bz2
commit 8ed432188d3c42d9a3a710dc9a123a6733d4fc8e Author: Jiri Skala jskala@redhat.com Date: Fri Aug 19 09:09:34 2011 +0200
added afp_ldap.conf among files to install
diff --git a/netatalk.spec b/netatalk.spec index 9a5911e..60ca3a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -163,6 +163,7 @@ fi %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}/pam.d/netatalk %{_sbindir}/* %{_bindir}/*
commit 7cf58e44697d9fb6bdca211f76cb825055fa0a83 Author: Jiri Skala jskala@redhat.com Date: Fri Aug 19 08:44:35 2011 +0200
fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel
diff --git a/netatalk.spec b/netatalk.spec index 455b480..9a5911e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -17,7 +17,9 @@ Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel +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)
%description @@ -186,6 +188,9 @@ fi %attr(755,root,root) %{_initrddir}/netatalk
%changelog +* Fri Aug 19 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + * Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 - fixed missing epoch in sysvinit subpackage and triggers
commit 555e92d3276dcf45e6f993ec54f7b94f376c6661 Author: Jiri Skala jskala@redhat.com Date: Fri Aug 5 15:19:18 2011 +0200
fixed missing epoch in sysvinit subpackage and triggers
diff --git a/netatalk.spec b/netatalk.spec index e79bb1c..455b480 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -39,7 +39,7 @@ programs. %package sysvinit Group: System Environment/Daemons Summary: SysV initscript for netatalk -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires(preun): /sbin/service Requires(postun): /sbin/service
@@ -140,11 +140,11 @@ fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%triggerun -- %{name} < 2.2.0-2 +%triggerun -- %{name} < 4:2.2.0-2 /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || :
-%triggerpostun -n %{name}-sysvinit -- %{name} < 2.2.0-2 +%triggerpostun -n %{name}-sysvinit -- %{name} < 4:2.2.0-2 /sbin/chkconfig --add netatalk >/dev/null 2>&1 || :
%files @@ -186,6 +186,9 @@ fi %attr(755,root,root) %{_initrddir}/netatalk
%changelog +* Fri Aug 05 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + * Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 - fixes #714448 - systemd-service - moves SysV initscript to subpackage
commit d08cb32fc9731ca89d6a153ff767c7099d447444 Author: Jiri Skala jskala@redhat.com Date: Thu Aug 4 16:47:42 2011 +0200
added systemd unit file, SysV initscript moved to subpackage
diff --git a/netatalk.service b/netatalk.service new file mode 100644 index 0000000..7e24a36 --- /dev/null +++ b/netatalk.service @@ -0,0 +1,11 @@ +[Unit] +Description=File and Printer sharing via AppleTalk Protocol +After=syslog.target network.target + +[Service] +Type=oneshot +ExecStart=/bin/bash -c "exec /usr/libexec/netatalk/netatalk.sh" +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/netatalk.sh b/netatalk.sh new file mode 100755 index 0000000..d16a1c3 --- /dev/null +++ b/netatalk.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +ATALK_BIN=/usr/bin +ATALK_CONF_DIR=/etc/netatalk/ +ATALK_SBIN=/usr/sbin + +# read in netatalk configuration +if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then + . ${ATALK_CONF_DIR}/netatalk.conf +fi + +if [ x"${ATALKD_RUN}" != x"no" -a -x ${ATALK_SBIN}/atalkd ]; then + ${ATALK_SBIN}/atalkd + + if [ x"${PAPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/papd ]; then + ${ATALK_SBIN}/papd + fi + + # check for timelord in bin directory + if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_BIN}/timelord ]; then + ${ATALK_BIN}/timelord + fi + + # check for timelord in sbin directory + if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/timelord ]; then + ${ATALK_SBIN}/timelord + fi + + # check for a2boot in bin directory + if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_BIN}/a2boot ]; then + ${ATALK_BIN}/a2boot + fi + + # check for a2boot in sbin directory + if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_SBIN}/a2boot ]; then + ${ATALK_SBIN}/a2boot + fi +fi + +if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ]; then + ${ATALK_SBIN}/cnid_metad $CNID_CONFIG +fi + +if [ x"${AFPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/afpd ]; then + ${ATALK_SBIN}/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ + -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}" +fi diff --git a/netatalk.spec b/netatalk.spec index fa1bffe..e79bb1c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,22 +1,22 @@ 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.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 +Source1: netatalk.service Source2: netatalk.pam-system-auth +Source3: netatalk.sh
Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch
Url: http://netatalk.sourceforge.net/ Requires: pam -Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service /sbin/ldconfig BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +36,16 @@ Group: Development/Libraries This package contains the header files for building Appletalk networking programs.
+%package sysvinit +Group: System Environment/Daemons +Summary: SysV initscript for netatalk +Requires: %{name} = %{version}-%{release} +Requires(preun): /sbin/service +Requires(postun): /sbin/service + +%description sysvinit +The netatalk-sysvinit contains SysV initscritps support. + %prep %setup -q
@@ -106,6 +116,11 @@ cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/usr/libexec/netatalk +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/libexec/netatalk + # Clean up .a and .la files find $RPM_BUILD_ROOT -name *.a -exec rm {} ; find $RPM_BUILD_ROOT -name *.la -exec rm {} ; @@ -114,23 +129,23 @@ find $RPM_BUILD_ROOT -name *.la -exec rm {} ; rm -rf $RPM_BUILD_ROOT
%post -/sbin/chkconfig --add netatalk -/sbin/ldconfig +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%preun if [ "$1" = "0" ] ; then - # 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 + /bin/systemctl disable netatalk.service > /dev/null 2>&1 || : + /bin/systemctl stop netatalk.service > /dev/null 2>&1 || : fi
%postun -if [ "$1" -ge "1" ]; then - /sbin/service netatalk condrestart > /dev/null 2>&1 || : -fi -/sbin/ldconfig +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%triggerun -- %{name} < 2.2.0-2 + /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : + /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || : + +%triggerpostun -n %{name}-sysvinit -- %{name} < 2.2.0-2 + /sbin/chkconfig --add netatalk >/dev/null 2>&1 || :
%files %defattr(-,root,root) @@ -138,7 +153,8 @@ fi %doc doc %doc config.example %dir %{_sysconfdir}/netatalk -%attr(755,root,root) %{_initrddir}/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 @@ -166,7 +182,14 @@ fi %{_bindir}/netatalk-config %{_mandir}/man*/netatalk-config.1*
+%files sysvinit +%attr(755,root,root) %{_initrddir}/netatalk + %changelog +* Thu Aug 04 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + * Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 - update to latest upstream netatalk-2.2.0
commit b548077d882431748c811e2eec3b5d48760d434e Author: Jiri Skala jskala@redhat.com Date: Fri Jul 29 15:03:11 2011 +0200
update to latest upstream netatalk-2.2.0
diff --git a/.gitignore b/.gitignore index 6fc4134..6013e57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 /netatalk-2.1.5.tar.bz2 +/netatalk-2.2.0.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index c0ca098..fa1bffe 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.5 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -71,7 +71,8 @@ export CFLAGS="$CFLAGS -fsigned-char" --enable-krbV-uam \ --enable-overwrite \ --with-gnu-ld \ - --enable-redhat + --enable-redhat \ + --with-libgcrypt
# Grrrr. Fix broken libtool/autoFOO Makefiles. if [ "%{_lib}" != lib ]; then @@ -94,17 +95,17 @@ 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
cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
-# Fix up ICDumpSuffixMap -sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap -touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap - # Clean up .a and .la files find $RPM_BUILD_ROOT -name *.a -exec rm {} ; find $RPM_BUILD_ROOT -name *.la -exec rm {} ; @@ -133,8 +134,8 @@ fi
%files %defattr(-,root,root) -%doc COPYRIGHT COPYING ChangeLog README* TODO VERSION NEWS -%doc ICDumpSuffixMap doc +%doc COPYRIGHT COPYING ChangeLog VERSION NEWS +%doc doc %doc config.example %dir %{_sysconfdir}/netatalk %attr(755,root,root) %{_initrddir}/netatalk @@ -153,7 +154,6 @@ fi %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so -%{_libexecdir}/*
%files devel %defattr(-,root,root) @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Jul 29 2011 Jiri Skala jskala@redhat.com - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + * Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources index f075345..0022dbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2495f832643cef131bc3032274fbf926 netatalk-2.1.5.tar.bz2 +acac2b5f2d9f43bfd5ea2a5cf4c71fe5 netatalk-2.2.0.tar.bz2
commit 793822ce7e286cbaaf5057e73ea120acf7b23cfc Author: Dennis Gilmore dennis@ausil.us Date: Tue Feb 8 17:43:23 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index a23ecdd..c0ca098 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ 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.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 - updated to latest upstream version netatalk-2.1.5
commit e436a4e57345e8a4a35080d40953bea9d5ab903d Author: Jiri Skala <jskala@skalniknb.(none)> Date: Mon Jan 3 13:57:50 2011 +0100
- updated to latest upstream version netatalk-2.1.5
diff --git a/.gitignore b/.gitignore index 0b9759b..6fc4134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 +/netatalk-2.1.5.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index c5e696b..a23ecdd 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ 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.4 +Version: 2.1.5 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Jan 03 2011 Jiri Skala jskala@redhat.com - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + * Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 - updated to latest upstream version
diff --git a/sources b/sources index e6cdff4..f075345 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3251290f3f1bf10acdf407dea585bae netatalk-2.1.4.tar.bz2 +2495f832643cef131bc3032274fbf926 netatalk-2.1.5.tar.bz2
commit 90c588d47c7775d93447f1d6166f54dd51ec38de Author: Jiri Skala <jskala@localhost.(none)> Date: Mon Oct 18 09:28:59 2010 +0200
- updated to latest upstream version
diff --git a/.gitignore b/.gitignore index 4c53fea..0b9759b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ netatalk-2.1.3.tar.bz2 +/netatalk-2.1.4.tar.bz2 diff --git a/sources b/sources index 54493e7..e6cdff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5916e70ca6fd16748d8c62a2c41114ca netatalk-2.1.3.tar.bz2 +b3251290f3f1bf10acdf407dea585bae netatalk-2.1.4.tar.bz2
commit 8a105cc200bf3ce5198c50ad3da0aba0cf65b23c Author: Jiri Skala <jskala@localhost.(none)> Date: Mon Oct 18 09:28:30 2010 +0200
- updated to latest upstream version
diff --git a/netatalk.spec b/netatalk.spec index e41a9c9..c5e696b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ 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.3 +Version: 2.1.4 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Oct 18 2010 Jiri Skala jskala@redhat.com - 4:2.1.4-1 +- updated to latest upstream version + * Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 - updated to latest upstream version - added license texts to devel subpackage
commit 8ddf231d2e7fb08f2ccf166971741ba70e9395dc Author: Fedora Release Engineering rel-eng@lists.fedoraproject.org Date: Thu Jul 29 04:14:51 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4c53fea..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -netatalk-2.1.3.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c53fea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +netatalk-2.1.3.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 63101a0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: netatalk -# $Id: Makefile,v 1.2 2007/10/15 19:10:48 notting Exp $ -NAME := netatalk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)
commit f9494120d82998f34fb257bf12c726629f39e644 Author: Jiri Skala jskala@fedoraproject.org Date: Mon Jul 12 10:50:12 2010 +0000
- updated to latest upstream version - added license texts to devel subpackage
diff --git a/.cvsignore b/.cvsignore index abdba95..4c53fea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.2.tar.bz2 +netatalk-2.1.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 5314642..e41a9c9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ 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.2 +Version: 2.1.3 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -133,7 +133,7 @@ fi
%files %defattr(-,root,root) -%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT COPYING ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %doc config.example %dir %{_sysconfdir}/netatalk @@ -157,6 +157,7 @@ fi
%files devel %defattr(-,root,root) +%doc COPYRIGHT COPYING %dir %{_includedir}/atalk %dir %{_includedir}/netatalk %attr(0644,root,root) %{_includedir}/atalk/* @@ -166,6 +167,10 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Jul 12 2010 Jiri Skala jskala@redhat.com - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + * Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 - updated to latest upstream version
diff --git a/sources b/sources index 9c7d860..54493e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94d4ea19fc48c37e28f02062e25046ea netatalk-2.1.2.tar.bz2 +5916e70ca6fd16748d8c62a2c41114ca netatalk-2.1.3.tar.bz2
commit c9cb9c40a4f05cf46acbf1a00bf5c9c717e235b8 Author: Jiri Skala jskala@fedoraproject.org Date: Wed Jun 30 09:17:54 2010 +0000
- updated to latest upstream version
diff --git a/.cvsignore b/.cvsignore index 6d5e497..abdba95 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.1.tar.bz2 +netatalk-2.1.2.tar.bz2 diff --git a/netatalk-2.1-initscript.patch b/netatalk-2.1-initscript.patch deleted file mode 100644 index 9f5f5ac..0000000 --- a/netatalk-2.1-initscript.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 diff --git a/netatalk.spec b/netatalk.spec index de51477..5314642 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ 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.1 +Version: 2.1.2 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -10,7 +10,6 @@ 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-initscript.patch
Url: http://netatalk.sourceforge.net/ Requires: pam @@ -42,7 +41,6 @@ programs.
%patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator -%patch3 -p1 -b .initscript
ln -s ./NEWS ChangeLog
@@ -168,6 +166,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Jun 30 2010 Jiri Skala jskala@redhat.com - 4:2.1.2-1 +- updated to latest upstream version + * Fri May 28 2010 Jiri Skala jskala@redhat.com - 4:2.1.1-1 - updated to latest upstream version - fixes #594999 - Summary and Description are old-fashioned diff --git a/sources b/sources index 8bebffe..9c7d860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d91913958970b4bcd72577aa52aa31be netatalk-2.1.1.tar.bz2 +94d4ea19fc48c37e28f02062e25046ea netatalk-2.1.2.tar.bz2
commit 9b73602ac2538f6c5bbeb77785f6e20502b05e94 Author: Jiri Skala jskala@fedoraproject.org Date: Fri May 28 08:06:06 2010 +0000
- updated to latest upstream version - fixes #594999 - Summary and Description are old-fashioned - renamed initscript - initscript modified to be POSIX compliant
diff --git a/.cvsignore b/.cvsignore index 84731dd..6d5e497 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.tar.bz2 +netatalk-2.1.1.tar.bz2 diff --git a/netatalk-2.1-initscript.patch b/netatalk-2.1-initscript.patch new file mode 100644 index 0000000..9f5f5ac --- /dev/null +++ b/netatalk-2.1-initscript.patch @@ -0,0 +1,83 @@ +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 diff --git a/netatalk-2.1-mkfile.patch b/netatalk-2.1-mkfile.patch deleted file mode 100644 index 31231cd..0000000 --- a/netatalk-2.1-mkfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.1/distrib/initscripts/Makefile.am.mkfile netatalk-2.1/distrib/initscripts/Makefile.am ---- netatalk-2.1/distrib/initscripts/Makefile.am.mkfile 2010-05-14 10:46:29.289421698 +0200 -+++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-14 10:48:34.953140484 +0200 -@@ -57,7 +57,7 @@ uninstall: uninstall-startup - - if USE_REDHAT - --sysvdir = $(DESTDIR)/etc/rc.d/init.d -+sysvdir = /etc/rc.d/init.d - sysv_SCRIPTS = atalk - - $(sysv_SCRIPTS): rc.atalk.redhat diff --git a/netatalk.spec b/netatalk.spec index 9a96a79..de51477 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -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-%%7Bversion%7D.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-devel pam quota-devel libtool automake aut 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,-z,noexecstack,-z,nodlopen" %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 rm {} ; 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@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@redhat.com - 4:2.1-1 - updated to latest upstream version
diff --git a/sources b/sources index 350a969..8bebffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b780f98a8764daab45d288579320a8a0 netatalk-2.1.tar.bz2 +d91913958970b4bcd72577aa52aa31be netatalk-2.1.1.tar.bz2
commit a87ce1d324605c215e753249fc783b749b478bf1 Author: Jiri Skala jskala@fedoraproject.org Date: Fri May 14 11:53:37 2010 +0000
- updated to latest upstream version
diff --git a/.cvsignore b/.cvsignore index 80e07f8..84731dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.0.5.tar.bz2 +netatalk-2.1.tar.bz2 diff --git a/netatalk-2.0.3-nodefault.patch b/netatalk-2.0.3-nodefault.patch deleted file mode 100644 index ae30fc8..0000000 --- a/netatalk-2.0.3-nodefault.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl.foo 2005-07-20 17:23:05.000000000 -0400 -+++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl 2005-07-20 17:23:14.000000000 -0400 -@@ -1,5 +1,5 @@ - #! /bin/sh --# chkconfig: 345 91 35 -+# chkconfig: - 91 35 - # description: This package enables Linux to talk to Macintosh - # computers via the AppleTalk networking protocol and - # provides printer, file sharing, and AppleTalk routing diff --git a/netatalk-2.0.4-db4_2-db4_3.patch b/netatalk-2.0.4-db4_2-db4_3.patch deleted file mode 100644 index ff9cd3e..0000000 --- a/netatalk-2.0.4-db4_2-db4_3.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c ---- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 2009-07-14 15:54:50.444609410 +0200 -+++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 15:58:10.143829111 +0200 -@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - ret = db->stat(db, db_txn, &sp, 0); - #else -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - #endif - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - -diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c ---- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 2009-07-14 15:55:16.428613311 +0200 -+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 15:57:17.038828997 +0200 -@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - ret = db->stat(db, db_txn, &sp, 0); - #else -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - #endif - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - diff --git a/netatalk-2.0.4-open_call.patch b/netatalk-2.0.4-open_call.patch deleted file mode 100644 index 1c9eece..0000000 --- a/netatalk-2.0.4-open_call.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.open_call netatalk-2.0.4/bin/cnid/cnid_index.c ---- netatalk-2.0.4/bin/cnid/cnid_index.c.open_call 2009-07-14 16:31:13.662612798 +0200 -+++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 16:32:12.494829074 +0200 -@@ -356,7 +356,7 @@ static int dbif_env_init(void) - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.4/etc/cnid_dbd/dbif.c ---- netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call 2009-07-14 16:27:46.905837395 +0200 -+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 16:33:31.712829253 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -163,7 +163,7 @@ int dbif_env_init(struct db_param *dbp) - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -197,7 +197,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2009-03-29 09:23:23.000000000 +0200 -+++ netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c 2009-07-14 16:27:46.924861205 +0200 -@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } -diff -up netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call 2009-03-29 09:23:24.000000000 +0200 -+++ netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c 2009-07-14 16:27:46.928827444 +0200 -@@ -133,9 +133,9 @@ static int my_yield(void) - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); -+ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha - #endif /* DB_VERSION_MINOR > 1 */ - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - if (rc == DB_RUNRECOVERY) { - /* This is the mother of all errors. We _must_ fail here. */ - LOG(log_error, logtype_default, -@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.1-mkfile.patch b/netatalk-2.1-mkfile.patch new file mode 100644 index 0000000..31231cd --- /dev/null +++ b/netatalk-2.1-mkfile.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.1/distrib/initscripts/Makefile.am.mkfile netatalk-2.1/distrib/initscripts/Makefile.am +--- netatalk-2.1/distrib/initscripts/Makefile.am.mkfile 2010-05-14 10:46:29.289421698 +0200 ++++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-14 10:48:34.953140484 +0200 +@@ -57,7 +57,7 @@ uninstall: uninstall-startup + + if USE_REDHAT + +-sysvdir = $(DESTDIR)/etc/rc.d/init.d ++sysvdir = /etc/rc.d/init.d + sysv_SCRIPTS = atalk + + $(sysv_SCRIPTS): rc.atalk.redhat diff --git a/netatalk.spec b/netatalk.spec index f868b06..9a96a79 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,18 +1,18 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.5 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 # Source1: atalk.init Source2: netatalk.pam-system-auth -Patch1: netatalk-2.0.4-db4_2-db4_3.patch -Patch2: netatalk-2.0.2-uams_no_pie.patch -Patch3: netatalk-2.0.4-extern_ucreator.patch -Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.4-open_call.patch + +Patch1: netatalk-2.0.2-uams_no_pie.patch +Patch2: netatalk-2.0.4-extern_ucreator.patch +Patch3: netatalk-2.1-mkfile.patch + Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -37,11 +37,10 @@ programs.
%prep %setup -q -%patch1 -p1 -b .db4_2-db4_3 -%patch2 -p1 -b .uams_no_pie -%patch3 -p1 -b .extern_ucreator -%patch4 -p1 -%patch5 -p1 -b .open_call + +%patch1 -p1 -b .uams_no_pie +%patch2 -p1 -b .extern_ucreator +%patch3 -p1 -b .mkfile
ln -s ./NEWS ChangeLog
@@ -106,12 +105,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install #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/ -chmod a-x bin/afile/acleandir.rc -rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* -# + # install example config files in doc mkdir config.example -cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` 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/netatalk.conf config.example +cp -fp config/papd.conf config.example + cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h @@ -147,7 +150,7 @@ fi %defattr(-,root,root) %doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc -%doc bin/afile/acleandir.rc +# %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk %attr(755,root,root) %{_initrddir}/atalk @@ -179,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed May 12 2010 Jiri Skala jskala@redhat.com - 4:2.1-1 +- updated to latest upstream version + * Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 - oops forgot upload new sources => shifted release number
diff --git a/sources b/sources index 08ba88d..350a969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bd8f4780abc373e0539ab7cd1f9950f netatalk-2.0.5.tar.bz2 +b780f98a8764daab45d288579320a8a0 netatalk-2.1.tar.bz2
commit 0525712eb4bee0ab8a61fb74bf37aa7db94401a7 Author: Bill Nottingham notting@fedoraproject.org Date: Wed Nov 25 23:20:07 2009 +0000
Fix typo that causes a failure to update the common directory. (releng #2781)
diff --git a/Makefile b/Makefile index 4266b11..63101a0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: netatalk -# $Id: Makefile,v 1.1 2004/09/09 09:08:15 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:10:48 notting Exp $ NAME := netatalk SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 696dd1d38861b33aaf23c1ba642bd77fc2c19426 Author: Jiri Skala jskala@fedoraproject.org Date: Tue Nov 24 15:34:00 2009 +0000
- oops forgot upload new sources => shifted release number
diff --git a/.cvsignore b/.cvsignore index 6afc5ec..80e07f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.0.4.tar.bz2 +netatalk-2.0.5.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 1887af1..f868b06 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + * Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 - updated to latest upstream version
diff --git a/sources b/sources index dba923b..08ba88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f2f40b51ab9268836ef89a7dffaccb0 netatalk-2.0.4.tar.bz2 +3bd8f4780abc373e0539ab7cd1f9950f netatalk-2.0.5.tar.bz2
commit 1a014579697a658aefd2553aff97fe9daef9c93e Author: Jiri Skala jskala@fedoraproject.org Date: Tue Nov 24 15:26:10 2009 +0000
- updated to latest upstream version
diff --git a/atalk.init b/atalk.init deleted file mode 100644 index 817c16e..0000000 --- a/atalk.init +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# chkconfig: - 91 35 -# 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. -# processname: atalkd -# pidfile: /var/run/atalkd.pid -# config: /etc/atalk/* - -# Source function library. -. /etc/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Source Appletalk configuration -. /etc/atalk/netatalk.conf - -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - -start() { - echo -n $"Starting AppleTalk services: " - if [ ${ATALK_BGROUND} = yes ] ; then - echo -n "(backgrounded)" - { - daemon atalkd -f /etc/atalk/atalkd.conf - nbprgstr -p 4 "${ATALK_NAME}:Workstation" - nbprgstr -p 4 "${ATALK_NAME}:netatalk" - if [ ${PAPD_RUN} = yes ] ; then - daemon papd -f /etc/atalk/papd.conf - fi - if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system - fi - } >/dev/null & - else - daemon atalkd -f /etc/atalk/atalkd.conf - nbprgstr -p 4 "${ATALK_NAME}:Workstation" - nbprgstr -p 4 "${ATALK_NAME}:netatalk" - if [ ${PAPD_RUN} = yes ] ; then - daemon papd -f /etc/atalk/papd.conf - fi - if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system - fi - fi - echo - touch /var/lock/subsys/atalk -} - -stop() { - echo -n $"Shutting down AppleTalk services: " - killproc afpd - killproc papd - nbpunrgstr "${ATALK_NAME}:Workstation@*" - nbpunrgstr "${ATALK_NAME}:netatalk@*" - killproc atalkd - # Attempt to zap the module, so that we can restart the - # Appletalk daemons cleanly - if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then - modprobe -r appletalk - fi - rm -f /var/lock/subsys/atalk - echo "" -} - - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - condrestart) - [ -f /var/lock/subsys/atalk ] && restart || : - ;; - status) - status atalkd - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|condrestart}" - exit 1 -esac - -exit 0 diff --git a/netatalk.spec b/netatalk.spec index 816a935..1887af1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.4 -Release: 5%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Nov 24 2009 Jiri Skala jskala@redhat.com - 4:2.0.5-1 +- updated to latest upstream version + * Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 - added BuildRequires: ... libgcrypt-devel - removed outdated atalk.init
commit 17fb70554bcd0f9857ad6e109c9c31f7a52013af Author: Jiri Skala jskala@fedoraproject.org Date: Tue Nov 24 14:47:46 2009 +0000
- added BuildRequires: ... libgcrypt-devel - removed outdated atalk.init
diff --git a/netatalk.spec b/netatalk.spec index 7b755c4..816a935 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,12 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 -Source1: atalk.init +# Source1: atalk.init Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.4-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service /sbin/ldconfig -BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description @@ -179,6 +179,10 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Nov 23 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + * Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 - fixed #473943
commit d255f6fd88352319ed8b35492be739e0cf20038a Author: Jiri Skala jskala@fedoraproject.org Date: Tue Sep 15 21:02:51 2009 +0000
- fixed #473943
diff --git a/netatalk.spec b/netatalk.spec index 0c381f6..7b755c4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -66,9 +66,6 @@ export CFLAGS="$CFLAGS -fsigned-char" --with-cracklib \ --with-pam \ --with-shadow \ - --with-tcp-wrappers \ - --with-ssl \ - --with-flock-locksi \ --with-uams-path=%{_libdir}/atalk \ --enable-shared \ --enable-krbV-uam \ @@ -182,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Sep 15 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-4 +- fixed #473943 + * Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 - rebuilt with new openssl
commit d7a3d5c47da6a70890a4c8923564e83883f57c1c Author: Tom Mrz tmraz@fedoraproject.org Date: Fri Aug 21 14:41:11 2009 +0000
- rebuilt with new openssl
diff --git a/netatalk.spec b/netatalk.spec index fb44c52..0c381f6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -182,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Aug 21 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.4-3 +- rebuilt with new openssl + * Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
commit 57639ff7e5ac6e25b0fa45124d2847cc65914cfa Author: Jesse Keating jkeating@fedoraproject.org Date: Sat Jul 25 18:00:59 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 8c446b6..fb44c52 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -182,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 - updated to latest upstream version
commit ce34f05eac3007b4ba058d89452fe50ebde5f890 Author: Jiri Skala jskala@fedoraproject.org Date: Tue Jul 14 15:37:58 2009 +0000
- updated to latest upstream version
diff --git a/.cvsignore b/.cvsignore index abb0106..6afc5ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -netatalk-1.6.4.tar.bz2 -netatalk-2.0.2.tar.bz2 -netatalk-2.0.3.tar.bz2 +netatalk-2.0.4.tar.bz2 diff --git a/netatalk-1.6.3-norc.patch b/netatalk-1.6.3-norc.patch deleted file mode 100644 index 0c4c7d3..0000000 --- a/netatalk-1.6.3-norc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netatalk-1.6.3/bin/afile/Makefile.in.norc 2003-06-12 19:07:40.000000000 -0400 -+++ netatalk-1.6.3/bin/afile/Makefile.in 2003-07-08 14:22:28.000000000 -0400 -@@ -184,7 +184,6 @@ - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys - - bin_PROGRAMS = afile achfile --bin_SCRIPTS = acleandir.rc - - afile_SOURCES = afile.c common.c common.h - achfile_SOURCES = achfile.c common.c common.h ---- netatalk-1.6.3/man/man1/Makefile.in.norc 2003-06-09 11:59:12.000000000 -0400 -+++ netatalk-1.6.3/man/man1/Makefile.in 2003-07-08 14:22:28.000000000 -0400 -@@ -188,7 +188,6 @@ - GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 - TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl) - NONGENERATED_MANS = achfile.1 \ -- acleandir.1 \ - aecho.1 \ - afile.1 \ - afppasswd.1 \ diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch deleted file mode 100644 index c2822be..0000000 --- a/netatalk-2.0.2-db4_2-db4_3.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:32:53.000000000 +0200 -@@ -274,10 +274,10 @@ static int dbif_count(const int dbi, u_i - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:32:53.000000000 +0200 -@@ -514,10 +514,10 @@ int dbif_count(const int dbi, u_int32_t - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch deleted file mode 100644 index 3e3a919..0000000 --- a/netatalk-2.0.2-extern_ucreator.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.3/etc/afpd/desktop.c ---- netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator 2008-10-10 10:33:04.000000000 +0200 -+++ netatalk-2.0.3/etc/afpd/desktop.c 2008-10-10 10:33:04.000000000 +0200 -@@ -312,7 +312,7 @@ addicon_err: - } - - static u_char utag[] = { 0, 0, 0, 0 }; --static u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ -+u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ - static u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ - static short usize = 256; - static u_char uicon[] = { diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch deleted file mode 100644 index f15f806..0000000 --- a/netatalk-2.0.3-chmod.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c ---- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-10-10 10:33:20.000000000 +0200 -+++ netatalk-2.0.3/etc/afpd/unix.c 2008-10-10 10:33:20.000000000 +0200 -@@ -415,14 +415,14 @@ mode_t mode; - struct stat *st; - { - struct stat sb; --mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; -+mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ - - if (!st) { - if (stat(name, &sb) != 0) - return -1; - st = &sb; - } -- mode &= mask; /* keep only rw-rw-rw in mode */ -+ - mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ - if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { - return -1; diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch deleted file mode 100644 index 1c20b9a..0000000 --- a/netatalk-2.0.3-db4_5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up netatalk-2.0.3/macros/db3-check.m4.db4_5 netatalk-2.0.3/macros/db3-check.m4 ---- netatalk-2.0.3/macros/db3-check.m4.db4_5 2008-10-10 10:32:48.000000000 +0200 -+++ netatalk-2.0.3/macros/db3-check.m4 2008-10-10 10:32:48.000000000 +0200 -@@ -115,6 +115,9 @@ int main(void) { - AC_DEFUN([NETATALK_BERKELEY_LINK], - [ - atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_7,[-ldb-4.7]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch deleted file mode 100644 index 11788b1..0000000 --- a/netatalk-2.0.3-log_stderr.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c ---- netatalk-2.0.3/etc/papd/main.c.log_stderr 2008-10-10 10:33:30.000000000 +0200 -+++ netatalk-2.0.3/etc/papd/main.c 2008-10-10 10:33:30.000000000 +0200 -@@ -260,7 +260,7 @@ int main( ac, av ) - - switch (server_lock("papd", pidfile, debug)) { - case 0: /* open a couple things again in the child */ -- if ((c = open("/", O_RDONLY)) >= 0) { -+ if (!debug && (c = open("/", O_RDONLY)) >= 0) { - dup2(c, 1); - dup2(c, 2); - } -@@ -287,7 +287,8 @@ int main( ac, av ) - openlog( p, LOG_PID ); - #else /* ultrix */ - set_processname(p); -- syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr ); -+ syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid | -+ debug ? logoption_perror : 0, logfacility_lpr ); - #endif /* ultrix */ - - LOG(log_info, logtype_papd, "restart (%s)", version ); diff --git a/netatalk-2.0.3-lsb.patch b/netatalk-2.0.3-lsb.patch deleted file mode 100644 index ddd98da..0000000 --- a/netatalk-2.0.3-lsb.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat ---- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb 2008-02-25 15:29:38.000000000 +0100 -+++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat 2008-02-25 16:07:36.000000000 +0100 -@@ -1,8 +1,19 @@ - #! /bin/sh -+# -+### BEGIN INIT INFO -+# Provides: netatalk -+# Required-Start: $local_fs $network $syslog -+# Required-Stop: $local_fs $network $syslog -+# Short-Description: AppleTalk networking programs -+# 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. -+### END INIT INFO -+ - # chkconfig: - 91 35 --# description: This package enables Linux to talk to Macintosh --# computers via the AppleTalk networking protocol and --# provides printer, file sharing, and AppleTalk routing -+# description: This package enables Linux to talk to Macintosh \ -+# computers via the AppleTalk networking protocol and \ -+# provides printer, file sharing, and AppleTalk routing \ - # services. - # - # AppleTalk daemons. Make sure not to start atalkd in the background: -@@ -27,12 +38,12 @@ ATALK_SBIN=/usr/sbin - - if [ ! -x ${ATALK_SBIN}/atalkd ]; then - echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; -- exit 0; -+ exit 1; - fi - - if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then - echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; -- exit 0; -+ exit 6; - fi - - # read in netatalk configuration -@@ -41,7 +52,7 @@ fi - # Check that networking is up. - if [ ${NETWORKING} = "no" ]; then - echo "[Network isn't started]"; -- exit 0; -+ exit 1; - fi - - # initialize return values diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch deleted file mode 100644 index 11e7858..0000000 --- a/netatalk-2.0.3-maxsrv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c ---- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-10-10 10:33:25.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-10-10 10:33:25.000000000 +0200 -@@ -93,7 +93,7 @@ - static int srvfd; - static int rqstfd; - --#define MAXSRV 128 -+#define MAXSRV 512 - - #define MAXSPAWN 3 /* Max times respawned in.. */ - diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch deleted file mode 100644 index bfeaa87..0000000 --- a/netatalk-2.0.3-multiarch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in ---- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-10-10 10:33:35.000000000 +0200 -+++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-10-10 10:33:35.000000000 +0200 -@@ -218,9 +218,6 @@ fi - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi --if test "@libdir@" != /usr/lib ; then -- libs="-L@libdir@" --fi - af_cflags="$af_cflags $includes" - af_libs="$libs -latalk" - diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch deleted file mode 100644 index 5df0519..0000000 --- a/netatalk-2.0.3-open_call.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:33:14.000000000 +0200 -@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -353,7 +353,7 @@ static int dbif_env_init(void) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -379,7 +379,7 @@ static int dbif_env_init(void) - } - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:33:14.000000000 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2008-10-10 10:33:14.000000000 +0200 -@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } -diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2008-10-10 10:33:14.000000000 +0200 -@@ -133,9 +133,9 @@ static int my_yield(void) - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); -+ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha - #endif /* DB_VERSION_MINOR > 1 */ - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - if (rc == DB_RUNRECOVERY) { - /* This is the mother of all errors. We _must_ fail here. */ - LOG(log_error, logtype_default, -@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.0.3-papd_cmds.patch b/netatalk-2.0.3-papd_cmds.patch deleted file mode 100644 index fdc1e51..0000000 --- a/netatalk-2.0.3-papd_cmds.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -Nurad netatalk-2.0.3.orig/etc/papd/lp.c netatalk-2.0.3/etc/papd/lp.c ---- netatalk-2.0.3.orig/etc/papd/lp.c 2009-01-28 17:04:36.000000000 +0100 -+++ netatalk-2.0.3/etc/papd/lp.c 2009-01-28 17:05:01.000000000 +0100 -@@ -212,10 +212,54 @@ - - #define is_var(a, b) (strncmp((a), (b), 2) == 0) - -+static size_t quote(char *dest, char *src, const size_t bsize, size_t len) { -+ size_t used = 0; -+ -+ while (len && used < bsize ) { -+ switch (*src) { -+ case '$': -+ case '\': -+ case '"': -+ case ';': -+ case '&': -+ case '(': -+ case ')': -+ case ' ': -+ case '*': -+ case '#': -+ case '|': -+ case '>': -+ case '<': -+ case '[': -+ case ']': -+ case '{': -+ case '}': -+ case '^': -+ case '?': -+ case '~': -+ case '`': -+ case '\x0A': -+ case '\xFF': -+ if (used + 2 > bsize ) -+ return used; -+ *dest = '\'; -+ dest++; -+ used++; -+ break; -+ } -+ *dest = *src; -+ src++; -+ dest++; -+ len--; -+ used++; -+ } -+ return used; -+} -+ - static char* pipexlate(char *src) - { - char *p, *q, *dest; -- static char destbuf[MAXPATHLEN]; -+ static char destbuf[MAXPATHLEN + 1]; - size_t destlen = MAXPATHLEN; - int len = 0; - -@@ -224,13 +268,16 @@ - if (!src) - return NULL; - -- strncpy(dest, src, MAXPATHLEN); -- if ((p = strchr(src, '%')) == NULL) /* nothing to do */ -+ memset(dest, 0, sizeof(destbuf)); -+ if ((p = strchr(src, '%')) == NULL) { /* nothing to do */ -+ strncpy(dest, src, sizeof(dest) - 1); - return destbuf; -+ } - - /* first part of the path. just forward to the next variable. */ - len = MIN((size_t)(p - src), destlen); - if (len > 0) { -+ strncpy(dest, src, len); - destlen -= len; - dest += len; - } -@@ -246,17 +293,20 @@ - q = lp.lp_created_for; - } else if (is_var(p, "%%")) { - q = "%"; -- } else -- q = p; -+ } - - /* copy the stuff over. if we don't understand something that we - * should, just skip it over. */ - if (q) { -- len = MIN(p == q ? 2 : strlen(q), destlen); -+ len = MIN(strlen(q), destlen); -+ len = quote(dest, q, destlen, len); -+ } -+ else { -+ len = MIN(2, destlen); - strncpy(dest, q, len); -- dest += len; -- destlen -= len; - } -+ dest += len; -+ destlen -= len; - - /* stuff up to next $ */ - src = p + 2; diff --git a/netatalk-2.0.4-db4_2-db4_3.patch b/netatalk-2.0.4-db4_2-db4_3.patch new file mode 100644 index 0000000..ff9cd3e --- /dev/null +++ b/netatalk-2.0.4-db4_2-db4_3.patch @@ -0,0 +1,34 @@ +diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c +--- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 2009-07-14 15:54:50.444609410 +0200 ++++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 15:58:10.143829111 +0200 +@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + ret = db->stat(db, db_txn, &sp, 0); + #else +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + #endif + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + +diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c +--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 2009-07-14 15:55:16.428613311 +0200 ++++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 15:57:17.038828997 +0200 +@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + ret = db->stat(db, db_txn, &sp, 0); + #else +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + #endif + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + diff --git a/netatalk-2.0.4-extern_ucreator.patch b/netatalk-2.0.4-extern_ucreator.patch new file mode 100644 index 0000000..413ac08 --- /dev/null +++ b/netatalk-2.0.4-extern_ucreator.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.4/etc/afpd/desktop.c +--- netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator 2009-07-14 16:26:36.984610055 +0200 ++++ netatalk-2.0.4/etc/afpd/desktop.c 2009-07-14 16:27:01.607580009 +0200 +@@ -312,7 +312,7 @@ addicon_err: + } + + static const u_char utag[] = { 0, 0, 0, 0 }; +-static const u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ ++u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ + static const u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ + static const short usize = 256; + diff --git a/netatalk-2.0.4-open_call.patch b/netatalk-2.0.4-open_call.patch new file mode 100644 index 0000000..1c9eece --- /dev/null +++ b/netatalk-2.0.4-open_call.patch @@ -0,0 +1,119 @@ +diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.open_call netatalk-2.0.4/bin/cnid/cnid_index.c +--- netatalk-2.0.4/bin/cnid/cnid_index.c.open_call 2009-07-14 16:31:13.662612798 +0200 ++++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 16:32:12.494829074 +0200 +@@ -356,7 +356,7 @@ static int dbif_env_init(void) + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.4/etc/cnid_dbd/dbif.c +--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call 2009-07-14 16:27:46.905837395 +0200 ++++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 16:33:31.712829253 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -163,7 +163,7 @@ int dbif_env_init(struct db_param *dbp) + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -197,7 +197,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c +--- netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2009-03-29 09:23:23.000000000 +0200 ++++ netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c 2009-07-14 16:27:46.924861205 +0200 +@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c +--- netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call 2009-03-29 09:23:24.000000000 +0200 ++++ netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c 2009-07-14 16:27:46.928827444 +0200 +@@ -133,9 +133,9 @@ static int my_yield(void) + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); ++ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha + #endif /* DB_VERSION_MINOR > 1 */ + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + if (rc == DB_RUNRECOVERY) { + /* This is the mother of all errors. We _must_ fail here. */ + LOG(log_error, logtype_default, +@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } diff --git a/netatalk.spec b/netatalk.spec index e2974a4..8c446b6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,24 +1,18 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.3 -Release: 27%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init Source2: netatalk.pam-system-auth -Patch0: netatalk-2.0.3-db4_5.patch -Patch1: netatalk-2.0.2-db4_2-db4_3.patch +Patch1: netatalk-2.0.4-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch -Patch3: netatalk-2.0.2-extern_ucreator.patch +Patch3: netatalk-2.0.4-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-open_call.patch -Patch6: netatalk-2.0.3-chmod.patch -Patch7: netatalk-2.0.3-maxsrv.patch -Patch8: netatalk-2.0.3-log_stderr.patch -Patch9: netatalk-2.0.3-multiarch.patch -Patch10: netatalk-2.0.3-papd_cmds.patch +Patch5: netatalk-2.0.4-open_call.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -32,16 +26,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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. -The systems without coreutils 7.0 and later require netatalk-timeout package. - -%package timeout -Summary: Timeout utility for the systems without coreutils -Group: System Environment/Daemons -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: coreutils >= 7.0 - -%description timeout -The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils.
%package devel Summary: Headers for Appletalk development @@ -53,17 +37,11 @@ programs.
%prep %setup -q -%patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 %patch5 -p1 -b .open_call -%patch6 -p1 -b .chmod -%patch7 -p1 -b .maxsrv -%patch8 -p1 -b .log_stderr -%patch9 -p1 -b .multiarch -%patch10 -p1 -b .papd_cmds
ln -s ./NEWS ChangeLog
@@ -186,19 +164,13 @@ fi %{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config -%exclude %{_bindir}/timeout %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* -%exclude %{_mandir}/man1/timeout.1.gz %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/*
-%files timeout -%{_bindir}/timeout -%{_mandir}/man1/timeout.1.gz - %files devel %defattr(-,root,root) %dir %{_includedir}/atalk @@ -210,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Jul 14 2009 Jiri Skala jskala@redhat.com - 4:2.0.4-1 +- updated to latest upstream version + * Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources index bde5f18..dba923b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 +6f2f40b51ab9268836ef89a7dffaccb0 netatalk-2.0.4.tar.bz2
commit ee4ce2e5d7ca2c7e848ce707afa1cfb023f01f6c Author: Jesse Keating jkeating@fedoraproject.org Date: Thu Feb 26 04:58:22 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/netatalk.spec b/netatalk.spec index 28fbd56..e2974a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 26%{?dist} +Release: 27%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -210,6 +210,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 - Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability
commit a171a849b287478e695e115dc2f5eeca725cea87 Author: Jiri Skala jskala@fedoraproject.org Date: Tue Feb 17 07:27:13 2009 +0000
- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability
diff --git a/netatalk-2.0.3-papd_cmds.patch b/netatalk-2.0.3-papd_cmds.patch new file mode 100644 index 0000000..fdc1e51 --- /dev/null +++ b/netatalk-2.0.3-papd_cmds.patch @@ -0,0 +1,104 @@ +diff -Nurad netatalk-2.0.3.orig/etc/papd/lp.c netatalk-2.0.3/etc/papd/lp.c +--- netatalk-2.0.3.orig/etc/papd/lp.c 2009-01-28 17:04:36.000000000 +0100 ++++ netatalk-2.0.3/etc/papd/lp.c 2009-01-28 17:05:01.000000000 +0100 +@@ -212,10 +212,54 @@ + + #define is_var(a, b) (strncmp((a), (b), 2) == 0) + ++static size_t quote(char *dest, char *src, const size_t bsize, size_t len) { ++ size_t used = 0; ++ ++ while (len && used < bsize ) { ++ switch (*src) { ++ case '$': ++ case '\': ++ case '"': ++ case ';': ++ case '&': ++ case '(': ++ case ')': ++ case ' ': ++ case '*': ++ case '#': ++ case '|': ++ case '>': ++ case '<': ++ case '[': ++ case ']': ++ case '{': ++ case '}': ++ case '^': ++ case '?': ++ case '~': ++ case '`': ++ case '\x0A': ++ case '\xFF': ++ if (used + 2 > bsize ) ++ return used; ++ *dest = '\'; ++ dest++; ++ used++; ++ break; ++ } ++ *dest = *src; ++ src++; ++ dest++; ++ len--; ++ used++; ++ } ++ return used; ++} ++ + static char* pipexlate(char *src) + { + char *p, *q, *dest; +- static char destbuf[MAXPATHLEN]; ++ static char destbuf[MAXPATHLEN + 1]; + size_t destlen = MAXPATHLEN; + int len = 0; + +@@ -224,13 +268,16 @@ + if (!src) + return NULL; + +- strncpy(dest, src, MAXPATHLEN); +- if ((p = strchr(src, '%')) == NULL) /* nothing to do */ ++ memset(dest, 0, sizeof(destbuf)); ++ if ((p = strchr(src, '%')) == NULL) { /* nothing to do */ ++ strncpy(dest, src, sizeof(dest) - 1); + return destbuf; ++ } + + /* first part of the path. just forward to the next variable. */ + len = MIN((size_t)(p - src), destlen); + if (len > 0) { ++ strncpy(dest, src, len); + destlen -= len; + dest += len; + } +@@ -246,17 +293,20 @@ + q = lp.lp_created_for; + } else if (is_var(p, "%%")) { + q = "%"; +- } else +- q = p; ++ } + + /* copy the stuff over. if we don't understand something that we + * should, just skip it over. */ + if (q) { +- len = MIN(p == q ? 2 : strlen(q), destlen); ++ len = MIN(strlen(q), destlen); ++ len = quote(dest, q, destlen, len); ++ } ++ else { ++ len = MIN(2, destlen); + strncpy(dest, q, len); +- dest += len; +- destlen -= len; + } ++ dest += len; ++ destlen -= len; + + /* stuff up to next $ */ + src = p + 2; diff --git a/netatalk.spec b/netatalk.spec index 8c3a4e1..28fbd56 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -18,6 +18,7 @@ Patch6: netatalk-2.0.3-chmod.patch Patch7: netatalk-2.0.3-maxsrv.patch Patch8: netatalk-2.0.3-log_stderr.patch Patch9: netatalk-2.0.3-multiarch.patch +Patch10: netatalk-2.0.3-papd_cmds.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -62,6 +63,7 @@ programs. %patch7 -p1 -b .maxsrv %patch8 -p1 -b .log_stderr %patch9 -p1 -b .multiarch +%patch10 -p1 -b .papd_cmds
ln -s ./NEWS ChangeLog
@@ -208,10 +210,13 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog -* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:3.0.3-25 +* Mon Feb 16 2009 Jiri Skala jskala@redhat.com -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:2.0.3-25 - fixed epoch in the subpackage requires
-* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:3.0.3-24 +* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:2.0.3-24 - fix #473186 conflict timeout with coreutils
* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23
commit 501be50177243382a64a39ed8abba76c23b1babe Author: Jiri Skala jskala@fedoraproject.org Date: Tue Jan 27 10:26:26 2009 +0000
- fixed epoch in the subpackage requires
diff --git a/netatalk.spec b/netatalk.spec index 2d6d81c..8c3a4e1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -36,7 +36,7 @@ The systems without coreutils 7.0 and later require netatalk-timeout package. %package timeout Summary: Timeout utility for the systems without coreutils Group: System Environment/Daemons -Requires: netatalk = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: coreutils >= 7.0
%description timeout @@ -208,6 +208,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Jan 27 2009 Jiri Skala jskala@redhat.com -4:3.0.3-25 +- fixed epoch in the subpackage requires + * Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:3.0.3-24 - fix #473186 conflict timeout with coreutils
commit 76845d2a5fa5426da933fc47530312acf6c7c19b Author: Jiri Skala jskala@fedoraproject.org Date: Mon Jan 26 16:57:16 2009 +0000
- fix #473186 conflict timeout with coreutils
diff --git a/netatalk.spec b/netatalk.spec index 028ae3d..2d6d81c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -31,6 +31,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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. +The systems without coreutils 7.0 and later require netatalk-timeout package. + +%package timeout +Summary: Timeout utility for the systems without coreutils +Group: System Environment/Daemons +Requires: netatalk = %{version}-%{release} +Conflicts: coreutils >= 7.0 + +%description timeout +The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils.
%package devel Summary: Headers for Appletalk development @@ -174,13 +184,19 @@ fi %{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config +%exclude %{_bindir}/timeout %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* +%exclude %{_mandir}/man1/timeout.1.gz %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/*
+%files timeout +%{_bindir}/timeout +%{_mandir}/man1/timeout.1.gz + %files devel %defattr(-,root,root) %dir %{_includedir}/atalk @@ -192,6 +208,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Fri Jan 23 2009 Jiri Skala jskala@redhat.com -4:3.0.3-24 +- fix #473186 conflict timeout with coreutils + * Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 - rebuild with new openssl
commit ed9121319e95c8b82efda7e93e4214287e1ed549 Author: Tom Mrz tmraz@fedoraproject.org Date: Sat Jan 17 15:27:22 2009 +0000
- rebuild with new openssl
diff --git a/netatalk.spec b/netatalk.spec index 5e9f474..028ae3d 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -192,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Sat Jan 17 2009 Tomas Mraz tmraz@redhat.com - 4:2.0.3-23 +- rebuild with new openssl + * Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 - fix #473939 netatalk-2.0.3-21.fc10 disable quota
commit e323ab0ba07c2c2525f25f8c7229c0cb18a58560 Author: Jiri Skala jskala@fedoraproject.org Date: Thu Jan 15 09:50:03 2009 +0000
- fix #473939 netatalk-2.0.3-21.fc10 disable quota
diff --git a/netatalk.spec b/netatalk.spec index 166f0e7..5e9f474 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -24,7 +24,7 @@ Requires(post): /sbin/chkconfig /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service /sbin/ldconfig -BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description @@ -192,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Dec 03 2008 Jiri Skala jskala@redhat.com -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + * Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 - fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches
commit a4cba520515390f3f2b5e288fcaba669ad46e674 Author: Jiri Skala jskala@fedoraproject.org Date: Mon Oct 13 07:46:56 2008 +0000
- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches
diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch index a4fd7ea..c2822be 100644 --- a/netatalk-2.0.2-db4_2-db4_3.patch +++ b/netatalk-2.0.2-db4_2-db4_3.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/cnid_dbd/dbif.c.db4_2-db4_3 2004-12-21 08:36:12.000000000 -0500 -+++ netatalk-2.0.2/etc/cnid_dbd/dbif.c 2005-02-21 13:21:45.000000000 -0500 -@@ -514,10 +514,10 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:32:53.000000000 +0200 +@@ -274,10 +274,10 @@ static int dbif_count(const int dbi, u_i DB_BTREE_STAT *sp; DB *db = db_table[dbi].db;
@@ -13,9 +14,10 @@ return -1; }
---- netatalk-2.0.2/bin/cnid/cnid_index.c.db4_2-db4_3 2005-01-03 08:49:55.000000000 -0500 -+++ netatalk-2.0.2/bin/cnid/cnid_index.c 2005-02-21 13:23:12.000000000 -0500 -@@ -274,10 +274,10 @@ +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:32:53.000000000 +0200 +@@ -514,10 +514,10 @@ int dbif_count(const int dbi, u_int32_t DB_BTREE_STAT *sp; DB *db = db_table[dbi].db;
diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch index 3eaab67..3e3a919 100644 --- a/netatalk-2.0.2-extern_ucreator.patch +++ b/netatalk-2.0.2-extern_ucreator.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/afpd/desktop.c.extern_ucreator 2004-10-09 08:48:21.000000000 -0400 -+++ netatalk-2.0.2/etc/afpd/desktop.c 2005-03-07 15:44:07.000000000 -0500 -@@ -310,7 +310,7 @@ +diff -up netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.3/etc/afpd/desktop.c +--- netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator 2008-10-10 10:33:04.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/desktop.c 2008-10-10 10:33:04.000000000 +0200 +@@ -312,7 +312,7 @@ addicon_err: }
static u_char utag[] = { 0, 0, 0, 0 }; diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch index 09ab725..c41c66f 100644 --- a/netatalk-2.0.2-uams_no_pie.patch +++ b/netatalk-2.0.2-uams_no_pie.patch @@ -1,5 +1,6 @@ ---- netatalk-2.0.2/etc/uams/Makefile.am.uams_no_pie 2004-08-10 23:11:07.000000000 -0400 -+++ netatalk-2.0.2/etc/uams/Makefile.am 2005-02-21 14:30:23.000000000 -0500 +diff -up netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie netatalk-2.0.3/etc/uams/Makefile.am +--- netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/etc/uams/Makefile.am 2008-10-10 10:32:59.000000000 +0200 @@ -1,5 +1,5 @@ # Makefile.am for etc/uams/ - @@ -7,9 +8,10 @@ SUBDIRS = uams_krb4
# ---- netatalk-2.0.2/macros/gssapi-check.m4.uams_no_pie 2004-06-18 03:57:19.000000000 -0400 -+++ netatalk-2.0.2/macros/gssapi-check.m4 2005-02-21 14:58:26.000000000 -0500 -@@ -126,7 +126,7 @@ +diff -up netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie netatalk-2.0.3/macros/gssapi-check.m4 +--- netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/macros/gssapi-check.m4 2008-10-10 10:32:59.000000000 +0200 +@@ -126,7 +126,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK], if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) AC_MSG_RESULT([yes]) diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch index 3455bbe..f15f806 100644 --- a/netatalk-2.0.3-chmod.patch +++ b/netatalk-2.0.3-chmod.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c ---- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 -+++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 +--- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-10-10 10:33:20.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/unix.c 2008-10-10 10:33:20.000000000 +0200 @@ -415,14 +415,14 @@ mode_t mode; struct stat *st; { diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch index 0d95146..1c20b9a 100644 --- a/netatalk-2.0.3-db4_5.patch +++ b/netatalk-2.0.3-db4_5.patch @@ -1,9 +1,11 @@ ---- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 -+++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 -@@ -115,6 +115,8 @@ +diff -up netatalk-2.0.3/macros/db3-check.m4.db4_5 netatalk-2.0.3/macros/db3-check.m4 +--- netatalk-2.0.3/macros/db3-check.m4.db4_5 2008-10-10 10:32:48.000000000 +0200 ++++ netatalk-2.0.3/macros/db3-check.m4 2008-10-10 10:32:48.000000000 +0200 +@@ -115,6 +115,9 @@ int main(void) { AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_7,[-ldb-4.7]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch index ad2f645..11788b1 100644 --- a/netatalk-2.0.3-log_stderr.patch +++ b/netatalk-2.0.3-log_stderr.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c ---- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 -+++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 +--- netatalk-2.0.3/etc/papd/main.c.log_stderr 2008-10-10 10:33:30.000000000 +0200 ++++ netatalk-2.0.3/etc/papd/main.c 2008-10-10 10:33:30.000000000 +0200 @@ -260,7 +260,7 @@ int main( ac, av )
switch (server_lock("papd", pidfile, debug)) { diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch index b721ec6..11e7858 100644 --- a/netatalk-2.0.3-maxsrv.patch +++ b/netatalk-2.0.3-maxsrv.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c ---- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 -+++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 +--- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-10-10 10:33:25.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-10-10 10:33:25.000000000 +0200 @@ -93,7 +93,7 @@ static int srvfd; static int rqstfd; diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch index be18833..bfeaa87 100644 --- a/netatalk-2.0.3-multiarch.patch +++ b/netatalk-2.0.3-multiarch.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in ---- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 -+++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 +--- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-10-10 10:33:35.000000000 +0200 ++++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-10-10 10:33:35.000000000 +0200 @@ -218,9 +218,6 @@ fi if test "@includedir@" != /usr/include ; then includes="-I@includedir@" diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch index 4c3fe4e..5df0519 100644 --- a/netatalk-2.0.3-open_call.patch +++ b/netatalk-2.0.3-open_call.patch @@ -1,6 +1,72 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:33:14.000000000 +0200 +@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -353,7 +353,7 @@ static int dbif_env_init(void) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -379,7 +379,7 @@ static int dbif_env_init(void) + } + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:33:14.000000000 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2007-09-17 15:21:26.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-17 15:21:43.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2008-10-10 10:33:14.000000000 +0200 @@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) { @@ -36,8 +102,8 @@ diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0 goto fail_lock; } diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2007-09-17 15:14:36.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2007-09-17 15:15:06.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2008-10-10 10:33:14.000000000 +0200 @@ -133,9 +133,9 @@ static int my_yield(void) static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) { @@ -72,69 +138,3 @@ diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); goto fail_lock; } -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2007-09-17 15:14:49.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-09-17 15:15:35.000000000 +0200 -@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -353,7 +353,7 @@ static int dbif_env_init(void) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -379,7 +379,7 @@ static int dbif_env_init(void) - } - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2007-09-17 15:14:59.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-09-17 15:16:54.000000000 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); diff --git a/netatalk.spec b/netatalk.spec index d0ccc14..166f0e7 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,16 +1,13 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init Source2: netatalk.pam-system-auth -#Patch0: netatalk-1.6.3-norc.patch -#Patch1: netatalk-1.5.5-openssl097.patch -#Patch2: netatalk-1.5.5-pathcat.patch Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch @@ -45,9 +42,6 @@ programs.
%prep %setup -q -#%patch0 -p 1 -b .norc -#%patch1 -p 1 -b .openssl097 -#%patch2 -p1 -b .pathcat %patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie @@ -198,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Oct 13 2008 Jiri Skala jskala@redhat.com - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + * Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 - fix license tag
commit 9066f9eea81b071f076cd3d0925e948b0db87add Author: Tom Callaway spot@fedoraproject.org Date: Mon Aug 11 18:54:46 2008 +0000
fix license tag
diff --git a/netatalk.spec b/netatalk.spec index 9ddce93..d0ccc14 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,9 +1,9 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 4 -License: GPL +License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init @@ -198,6 +198,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Aug 11 2008 Tom "spot" Callaway tcallawa@redhat.com - 4:2.0.3-20 +- fix license tag + * Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 - fix chmod o+x (#225085) - increase the maximum number of cnid_dbd processes to 512 (#232805)
commit 960fc3ebbeca07c2eaa662d214853a6bb3ceb9c3 Author: Martin Nagy mnagy@fedoraproject.org Date: Thu Mar 6 15:40:16 2008 +0000
- fix chmod o+x (#225085) - increase the maximum number of cnid_dbd processes to 512 (#232805) - papd now writes debugging output to stderr when invoked with -d (#150021) - fix multiarch conflict for netatalk-devel (#342681)
diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch new file mode 100644 index 0000000..3455bbe --- /dev/null +++ b/netatalk-2.0.3-chmod.patch @@ -0,0 +1,20 @@ +diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c +--- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 ++++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 +@@ -415,14 +415,14 @@ mode_t mode; + struct stat *st; + { + struct stat sb; +-mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; ++mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ + + if (!st) { + if (stat(name, &sb) != 0) + return -1; + st = &sb; + } +- mode &= mask; /* keep only rw-rw-rw in mode */ ++ + mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ + if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { + return -1; diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch new file mode 100644 index 0000000..ad2f645 --- /dev/null +++ b/netatalk-2.0.3-log_stderr.patch @@ -0,0 +1,22 @@ +diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c +--- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 ++++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 +@@ -260,7 +260,7 @@ int main( ac, av ) + + switch (server_lock("papd", pidfile, debug)) { + case 0: /* open a couple things again in the child */ +- if ((c = open("/", O_RDONLY)) >= 0) { ++ if (!debug && (c = open("/", O_RDONLY)) >= 0) { + dup2(c, 1); + dup2(c, 2); + } +@@ -287,7 +287,8 @@ int main( ac, av ) + openlog( p, LOG_PID ); + #else /* ultrix */ + set_processname(p); +- syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr ); ++ syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid | ++ debug ? logoption_perror : 0, logfacility_lpr ); + #endif /* ultrix */ + + LOG(log_info, logtype_papd, "restart (%s)", version ); diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch new file mode 100644 index 0000000..b721ec6 --- /dev/null +++ b/netatalk-2.0.3-maxsrv.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c +--- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 ++++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 +@@ -93,7 +93,7 @@ + static int srvfd; + static int rqstfd; + +-#define MAXSRV 128 ++#define MAXSRV 512 + + #define MAXSPAWN 3 /* Max times respawned in.. */ + diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch new file mode 100644 index 0000000..be18833 --- /dev/null +++ b/netatalk-2.0.3-multiarch.patch @@ -0,0 +1,13 @@ +diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in +--- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 ++++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 +@@ -218,9 +218,6 @@ fi + if test "@includedir@" != /usr/include ; then + includes="-I@includedir@" + fi +-if test "@libdir@" != /usr/lib ; then +- libs="-L@libdir@" +-fi + af_cflags="$af_cflags $includes" + af_libs="$libs -latalk" + diff --git a/netatalk.spec b/netatalk.spec index 393b9ce..9ddce93 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -17,6 +17,10 @@ Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch Patch5: netatalk-2.0.3-open_call.patch +Patch6: netatalk-2.0.3-chmod.patch +Patch7: netatalk-2.0.3-maxsrv.patch +Patch8: netatalk-2.0.3-log_stderr.patch +Patch9: netatalk-2.0.3-multiarch.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -50,6 +54,10 @@ programs. %patch3 -p1 -b .extern_ucreator %patch4 -p1 %patch5 -p1 -b .open_call +%patch6 -p1 -b .chmod +%patch7 -p1 -b .maxsrv +%patch8 -p1 -b .log_stderr +%patch9 -p1 -b .multiarch
ln -s ./NEWS ChangeLog
@@ -190,6 +198,12 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Thu Mar 06 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + * Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 - make init script LSB compliant (#246993)
commit c5506f321fa09f0a87f44fabce358e1642bfd949 Author: Martin Nagy mnagy@fedoraproject.org Date: Mon Feb 25 15:46:32 2008 +0000
- make init script LSB compliant (#246993)
diff --git a/netatalk-2.0.3-lsb.patch b/netatalk-2.0.3-lsb.patch new file mode 100644 index 0000000..ddd98da --- /dev/null +++ b/netatalk-2.0.3-lsb.patch @@ -0,0 +1,50 @@ +diff -up netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat +--- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb 2008-02-25 15:29:38.000000000 +0100 ++++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat 2008-02-25 16:07:36.000000000 +0100 +@@ -1,8 +1,19 @@ + #! /bin/sh ++# ++### BEGIN INIT INFO ++# Provides: netatalk ++# Required-Start: $local_fs $network $syslog ++# Required-Stop: $local_fs $network $syslog ++# Short-Description: AppleTalk networking programs ++# 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. ++### END INIT INFO ++ + # chkconfig: - 91 35 +-# description: This package enables Linux to talk to Macintosh +-# computers via the AppleTalk networking protocol and +-# provides printer, file sharing, and AppleTalk routing ++# description: This package enables Linux to talk to Macintosh \ ++# computers via the AppleTalk networking protocol and \ ++# provides printer, file sharing, and AppleTalk routing \ + # services. + # + # AppleTalk daemons. Make sure not to start atalkd in the background: +@@ -27,12 +38,12 @@ ATALK_SBIN=/usr/sbin + + if [ ! -x ${ATALK_SBIN}/atalkd ]; then + echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; +- exit 0; ++ exit 1; + fi + + if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then + echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; +- exit 0; ++ exit 6; + fi + + # read in netatalk configuration +@@ -41,7 +52,7 @@ fi + # Check that networking is up. + if [ ${NETWORKING} = "no" ]; then + echo "[Network isn't started]"; +- exit 0; ++ exit 1; + fi + + # initialize return values diff --git a/netatalk.spec b/netatalk.spec index 4a330c1..393b9ce 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -190,6 +190,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-18 +- make init script LSB compliant (#246993) + * Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 - fix unowned directories (#233889)
commit 793f14219c5d102edb78795bd36b99c5e3615cf9 Author: Martin Nagy mnagy@fedoraproject.org Date: Mon Feb 25 09:14:10 2008 +0000
- fix unowned directories (#233889)
diff --git a/netatalk.spec b/netatalk.spec index 954bb44..4a330c1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -175,12 +175,14 @@ fi %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* %{_datadir}/netatalk +%dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/*
%files devel %defattr(-,root,root) %dir %{_includedir}/atalk +%dir %{_includedir}/netatalk %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 @@ -188,6 +190,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Feb 25 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-17 +- fix unowned directories (#233889) + * Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 - rebuild for gcc-4.3
commit 0260511b005643ab3e3127c4c4854cc0b4f823cd Author: Martin Nagy mnagy@fedoraproject.org Date: Mon Feb 11 09:58:54 2008 +0000
- rebuild for gcc-4.3
diff --git a/netatalk.spec b/netatalk.spec index 9c466f8..954bb44 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 15.1%{?dist} +Release: 16%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -188,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Mon Feb 11 2008 Martin Nagy mnagy@redhat.com - 4:2.0.3-16 +- rebuild for gcc-4.3 + * Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 - rebuild
commit b92ff274d02f559a84d2cd5c51724cbcf92f45dc Author: Martin Nagy mnagy@fedoraproject.org Date: Tue Dec 4 10:03:39 2007 +0000
- rebuild
diff --git a/netatalk.spec b/netatalk.spec index e67d557..9c466f8 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 15%{?dist} +Release: 15.1%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons
commit 8ecbe6dfe02e01f74db54e91b3d090bc646b5b4e Author: Martin Nagy mnagy@fedoraproject.org Date: Tue Dec 4 09:53:18 2007 +0000
- rebuild
diff --git a/netatalk.spec b/netatalk.spec index efbd72f..e67d557 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -188,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Dec 04 2007 Martin Nagy mnagy@redhat.com - 4:2.0.3-15.1 +- rebuild + * Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 - patch to build on FC, bad open call
commit b20183ae73078d1a45c37d1658a3f97e8f8f6d82 Author: Bill Nottingham notting@fedoraproject.org Date: Mon Oct 15 19:10:48 2007 +0000
makefile update to properly grab makefile.common
diff --git a/Makefile b/Makefile index 8f23fa1..4266b11 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: netatalk -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 09:08:15 cvsdist Exp $ NAME := netatalk SPECFILE = $(firstword $(wildcard *.spec))
-include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON)
commit 3ec36b19235460c61fc70fe11563b600426ee927 Author: Maros Barabas mbarabas@fedoraproject.org Date: Mon Sep 17 13:29:53 2007 +0000
- patch to build on FC, bad open call
diff --git a/netatalk-2.0.3-build_open.patch b/netatalk-2.0.3-build_open.patch deleted file mode 100644 index c883eac..0000000 --- a/netatalk-2.0.3-build_open.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old 2004-03-22 05:38:51.000000000 +0100 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-11 17:59:59.000000000 +0200 -@@ -131,9 +131,9 @@ - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch new file mode 100644 index 0000000..4c3fe4e --- /dev/null +++ b/netatalk-2.0.3-open_call.patch @@ -0,0 +1,140 @@ +diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2007-09-17 15:21:26.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-17 15:21:43.000000000 +0200 +@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c +--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2007-09-17 15:14:36.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2007-09-17 15:15:06.000000000 +0200 +@@ -133,9 +133,9 @@ static int my_yield(void) + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); ++ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha + #endif /* DB_VERSION_MINOR > 1 */ + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + if (rc == DB_RUNRECOVERY) { + /* This is the mother of all errors. We _must_ fail here. */ + LOG(log_error, logtype_default, +@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2007-09-17 15:14:49.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-09-17 15:15:35.000000000 +0200 +@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -353,7 +353,7 @@ static int dbif_env_init(void) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -379,7 +379,7 @@ static int dbif_env_init(void) + } + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2007-09-17 15:14:59.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-09-17 15:16:54.000000000 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); diff --git a/netatalk.spec b/netatalk.spec index 76ad578..efbd72f 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,7 +16,7 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-build_open.patch +Patch5: netatalk-2.0.3-open_call.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -49,7 +49,7 @@ programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 -%patch5 -p1 -b .build_open +%patch5 -p1 -b .open_call
ln -s ./NEWS ChangeLog
@@ -188,7 +188,7 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog -* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-14 +* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-15 - patch to build on FC, bad open call
* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13
commit 3183e5f76424681bd86630a6d35a5c65201d31fe Author: Maros Barabas mbarabas@fedoraproject.org Date: Wed Sep 12 11:09:00 2007 +0000
Build fix
diff --git a/netatalk-2.0.3-build_open.patch b/netatalk-2.0.3-build_open.patch new file mode 100644 index 0000000..c883eac --- /dev/null +++ b/netatalk-2.0.3-build_open.patch @@ -0,0 +1,36 @@ +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old 2004-03-22 05:38:51.000000000 +0100 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-11 17:59:59.000000000 +0200 +@@ -131,9 +131,9 @@ + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } diff --git a/netatalk.spec b/netatalk.spec index 3b3910c..76ad578 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,6 +16,7 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch +Patch5: netatalk-2.0.3-build_open.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -48,6 +49,7 @@ programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 +%patch5 -p1 -b .build_open
ln -s ./NEWS ChangeLog
@@ -186,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Sep 12 2007 Maros Barabas mbarabas@redhat.com -4:2.0.3-14 +- patch to build on FC, bad open call + * Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 - rebuild
commit 63fc7de278d2d1e10ca6ba6cd8f71ebf4dbd1a97 Author: Maros Barabas mbarabas@fedoraproject.org Date: Tue Sep 11 15:28:28 2007 +0000
rebuild
diff --git a/netatalk.spec b/netatalk.spec index 242e9e1..3b3910c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -186,6 +186,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Tue Sep 11 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-13 +- rebuild + * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 - Rebuild for selinux ppc32 issue.
commit 8f0e36bc3a090005a8c7f4d12248d59881f22c97 Author: Jesse Keating jkeating@fedoraproject.org Date: Wed Aug 29 04:52:17 2007 +0000
- Rebuild for selinux ppc32 issue.
diff --git a/netatalk.spec b/netatalk.spec index d1c5edf..242e9e1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -186,6 +186,9 @@ fi %{_mandir}/man*/netatalk-config.1*
%changelog +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + * Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 - fix from merge review - Resolves #226190
commit 21e5d8b57d57f61b3a4c2edf5ad19850fb39ee1f Author: Maros Barabas mbarabas@fedoraproject.org Date: Thu Jun 28 12:51:12 2007 +0000
Fix merge review
diff --git a/netatalk.spec b/netatalk.spec index 28f771e..d1c5edf 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,16 +1,13 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init -#Source2: netatalk.config -#Source3: AppleVolumes.system -Source4: ICDumpSuffixMap -Source5: netatalk.pam-system-auth +Source2: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -34,12 +31,12 @@ AppleTalk networking protocol. It includes a daemon to allow Linux to act as a file server over EtherTalk or IP for Mac's.
%package devel -Summary: Headers and static libraries for Appletalk development +Summary: Headers for Appletalk development Group: Development/Libraries
%description devel -This package contains the header files, and static libraries for building -Appletalk networking programs. +This package contains the header files for building Appletalk networking +programs.
%prep %setup -q @@ -120,15 +117,22 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ chmod a-x bin/afile/acleandir.rc rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* -install -m644 %{SOURCE4} . # # install example config files in doc mkdir config.example cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example -cp -fp %{SOURCE5} config.example +cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
+# Fix up ICDumpSuffixMap +sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap +touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap + +# 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
@@ -155,7 +159,7 @@ fi %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk -%attr(755,root,root) %config %{_initrddir}/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 @@ -165,7 +169,9 @@ fi %config(noreplace) /etc/pam.d/netatalk %{_sbindir}/* %{_bindir}/* +%exclude %{_bindir}/netatalk-config %{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* %{_datadir}/netatalk %{_libdir}/atalk/*.so %{_libexecdir}/* @@ -173,15 +179,17 @@ fi %files devel %defattr(-,root,root) %dir %{_includedir}/atalk -%{_libdir}/*.a -%{_libdir}/*.la %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 -%{_libdir}/atalk/*.a -%{_libdir}/atalk/*.la %{_bindir}/netatalk-config +%{_mandir}/man*/netatalk-config.1* + %changelog +* Thu May 10 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + * Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 - fix fiew problems in spec
commit f8586500ca23f99a72ebd429ae2591dc12c53127 Author: Maros Barabas mbarabas@fedoraproject.org Date: Tue Apr 17 10:17:43 2007 +0000
Few problems in spec file
diff --git a/netatalk.spec b/netatalk.spec index 6db71aa..28f771e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -19,7 +19,6 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-wrong_script_interpreter.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -52,7 +51,6 @@ Appletalk networking programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 -%patch5 -p1
ln -s ./NEWS ChangeLog
@@ -185,9 +183,7 @@ fi %{_bindir}/netatalk-config %changelog * Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 -- fix merge review -- fix nonstandard line endings -- Resolves: #226190 +- fix fiew problems in spec
* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 - rebuild against new db4
commit 56db01793cd739d92d21effda81bd174d905fa52 Author: Maros Barabas mbarabas@fedoraproject.org Date: Tue Apr 17 10:11:03 2007 +0000
Fixed review #226190
diff --git a/netatalk.spec b/netatalk.spec index 6c54046..6db71aa 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,10 @@ - %define initdir /etc/rc.d/init.d - Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 4 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init #Source2: netatalk.config @@ -21,11 +19,15 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch +Patch5: netatalk-2.0.3-wrong_script_interpreter.patch Url: http://netatalk.sourceforge.net/ -Prereq: /sbin/chkconfig, /sbin/service -Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel -BuildRoot: %{_tmppath}/%{name}-root +Requires: pam +Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service /sbin/ldconfig +BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description This package enables Linux to talk to Macintosh computers via the @@ -50,6 +52,7 @@ Appletalk networking programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 +%patch5 -p1
ln -s ./NEWS ChangeLog
@@ -92,13 +95,13 @@ if [ "%{_lib}" != lib ]; then -e 's,-L/lib,-L/%{_lib},g' fi
-make all +make %{?_smp_mflags} all
%install rm -rf $RPM_BUILD_ROOT
#mkdir -p $RPM_BUILD_ROOT/etc/pam.d -#mkdir -p $RPM_BUILD_ROOT%{initdir} +#mkdir -p $RPM_BUILD_ROOT%{_initrddir} #mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install @@ -114,7 +117,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install # # Use netatalk's redhat initscript # -#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +#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/ chmod a-x bin/afile/acleandir.rc @@ -133,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%post /sbin/chkconfig --add atalk +/sbin/ldconfig
%preun if [ "$1" = "0" ] ; then @@ -144,6 +148,7 @@ fi if [ "$1" -ge "1" ]; then /sbin/service atalk condrestart > /dev/null 2>&1 || : fi +/sbin/ldconfig
%files %defattr(-,root,root) @@ -152,7 +157,7 @@ fi %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk -%attr(755,root,root) %config %{initdir}/atalk +%attr(755,root,root) %config %{_initrddir}/atalk %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf @@ -177,8 +182,13 @@ fi %{_datadir}/aclocal/netatalk.m4 %{_libdir}/atalk/*.a %{_libdir}/atalk/*.la - +%{_bindir}/netatalk-config %changelog +* Tue Apr 17 2007 Maros Barabas mbarabas@redhat.com - 4:2.0.3-10 +- fix merge review +- fix nonstandard line endings +- Resolves: #226190 + * Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 - rebuild against new db4
@@ -304,7 +314,7 @@ fi
* Thu Jan 04 2001 Than Ngo than@redhat.com - fixed uams-path -- added noreplace to %config +- added noreplace to %%config
* Mon Nov 20 2000 Tim Powers timp@redhat.com - rebuilt to fix bad dir perms @@ -372,7 +382,7 @@ fi - gzip man pages - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too - changed group -- added %defattr to %files section +- added %%defattr to %%files section
* Tue Aug 3 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - rpm-3.0 needs to remove vogus files from source. @@ -413,7 +423,7 @@ fi * Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Fix rcX.d's symbolic links. * Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp -- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. * Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp
commit efd27d6ea03e1781c6cbc48e6e83537e326b5743 Author: Jindrich Novy jnovy@fedoraproject.org Date: Tue Jan 23 13:54:57 2007 +0000
- fix typo
diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch index 494c6ad..0d95146 100644 --- a/netatalk-2.0.3-db4_5.patch +++ b/netatalk-2.0.3-db4_5.patch @@ -4,7 +4,7 @@ AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
commit 1abbbf332d76956b97f40dd0a568d45e6da3145f Author: Jindrich Novy jnovy@fedoraproject.org Date: Tue Jan 23 13:42:18 2007 +0000
- rebuild against new db4
diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch new file mode 100644 index 0000000..494c6ad --- /dev/null +++ b/netatalk-2.0.3-db4_5.patch @@ -0,0 +1,11 @@ +--- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 ++++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 +@@ -115,6 +115,8 @@ + AC_DEFUN([NETATALK_BERKELEY_LINK], + [ + atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) diff --git a/netatalk.spec b/netatalk.spec index 8390264..6c54046 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,7 +16,7 @@ Source5: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch -Patch0: netatalk-2.0.2-db4_3.patch +Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch @@ -45,7 +45,7 @@ Appletalk networking programs. #%patch0 -p 1 -b .norc #%patch1 -p 1 -b .openssl097 #%patch2 -p1 -b .pathcat -%patch0 -p1 -b .db4_3 +%patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Tue Jan 23 2007 Jindrich Novy jnovy@redhat.com - 4:2.0.3-9 +- rebuild against new db4 + * Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 - BuildRequires changed from cracklib to cracklib-devel
commit e3aa513f58c1369178df16a690cc2a3a1ed7e1d1 Author: Maros Barabas mbarabas@fedoraproject.org Date: Mon Dec 4 15:31:23 2006 +0000
updating BuildRequires #212903
diff --git a/netatalk.spec b/netatalk.spec index 19d1914..8390264 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -24,7 +24,7 @@ Patch4: netatalk-2.0.3-nodefault.patch Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel +BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel BuildRoot: %{_tmppath}/%{name}-root
%description @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Mon Dec 04 2006 Maros Barabas mbarabas@redhat.com - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + * Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* (#203001)
commit ababea5001878e218ba0a8c641422c2c929fb1f7 Author: Jesse Keating jkeating@fedoraproject.org Date: Fri Aug 18 20:15:48 2006 +0000
rebuilt with latest binutils
diff --git a/netatalk.spec b/netatalk.spec index c038ec4..19d1914 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 6.fc6.1 +Release: 7%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,11 @@ fi %{_libdir}/atalk/*.la
%changelog +* Fri Aug 18 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + * Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 - rebuild
commit 7c34b28330d886d5dc086343d9a7ad1059ee8279 Author: Jesse Keating jkeating@fedoraproject.org Date: Wed Jul 12 07:26:40 2006 +0000
bumped for rebuild
diff --git a/netatalk.spec b/netatalk.spec index 57f33b3..c038ec4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 6.fc6 +Release: 6.fc6.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Wed Jul 12 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-6.fc6.1 +- rebuild + * Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 - rebuild for broken libgssapi deps and brew build
commit 31787b05a70bc0c0bf07963aaab77674075bdb2d Author: jvdias jvdias@fedoraproject.org Date: Fri Jun 9 14:32:01 2006 +0000
rebuild for libgssapi deps and brew build
diff --git a/netatalk.spec b/netatalk.spec index 497ad1b..57f33b3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.2.1 +Release: 6.fc6 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Fri Jun 09 2006 Jason Vas Dias jvdias@redhat.com - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + * Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 - bump again for double-long bug on ppc(64)
commit 3e9feb30961e197fbdd56a09361d8e8671b8a231 Author: Jesse Keating jkeating@fedoraproject.org Date: Sat Feb 11 04:43:48 2006 +0000
bump for bug in double-long on ppc(64)
diff --git a/netatalk.spec b/netatalk.spec index 46d61af..497ad1b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.2 +Release: 4.2.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Fri Feb 10 2006 Jesse Keating jkeating@redhat.com - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com - rebuild for new gcc, glibc, glibc-kernheaders
commit 1efc91cbd1ebe8ac83f3c8f1b9675d305cbfed09 Author: jvdias jvdias@fedoraproject.org Date: Wed Feb 8 00:32:18 2006 +0000
rebuild for new gcc, glibc, glibc-kernheaders
diff --git a/netatalk.spec b/netatalk.spec index 79ab59b..46d61af 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.1 +Release: 4.2 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Tue Feb 07 2006 Jason Vas Dias jvdias@redhat.com +- rebuild for new gcc, glibc, glibc-kernheaders + * Fri Dec 09 2005 Jesse Keating jkeating@redhat.com - rebuilt
commit 35e9e6b48979dca4347ec2a6cf7407bdc6187cf6 Author: Jesse Keating jkeating@fedoraproject.org Date: Fri Dec 9 22:42:20 2005 +0000
gcc update bump
diff --git a/netatalk.spec b/netatalk.spec index 1368f2c..79ab59b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4 +Release: 4.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Fri Dec 09 2005 Jesse Keating jkeating@redhat.com +- rebuilt + * Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com - Rebuild for new openssl dependencies
commit ceca5e3483172b93adb76c9b50f8a7f22b040f71 Author: jvdias jvdias@fedoraproject.org Date: Thu Nov 10 00:26:03 2005 +0000
rebuild to fix broken openssl dependency
diff --git a/netatalk.spec b/netatalk.spec index 5e19b7a..1368f2c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 3 +Release: 4 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Wed Nov 09 2005 Jason Vas Dias jvdias@redhat.com +- Rebuild for new openssl dependencies + * Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com - use include instead of pam_stack in pam config
commit 073d6e6d701bcddfd0c86a35a9366b21d94a57ae Author: Tom Mrz tmraz@fedoraproject.org Date: Thu Oct 13 21:29:58 2005 +0000
- use include instead of pam_stack in pam config
diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..8147016 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,10 @@ +# /etc/pam.d/netatalk +# +# PAM configuration file for netatalk using system-auth substack +# (this would enable use of netatalk by LDAP or NIS users). +# +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth diff --git a/netatalk.spec b/netatalk.spec index a3c2db1..5e19b7a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 2 +Release: 3 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -12,7 +12,7 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Source5: netatalk.pam_stack +Source5: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Thu Oct 13 2005 Tomas Mraz tmraz@redhat.com +- use include instead of pam_stack in pam config + * Wed Jul 20 2005 Bill Nottingham notting@redhat.com - don't run by default
commit f53bad7cc3ae9ce10974e70831b4fc040e88246b Author: Bill Nottingham notting@fedoraproject.org Date: Wed Jul 20 21:29:52 2005 +0000
don't run by default
diff --git a/netatalk-2.0.3-nodefault.patch b/netatalk-2.0.3-nodefault.patch new file mode 100644 index 0000000..ae30fc8 --- /dev/null +++ b/netatalk-2.0.3-nodefault.patch @@ -0,0 +1,9 @@ +--- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl.foo 2005-07-20 17:23:05.000000000 -0400 ++++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl 2005-07-20 17:23:14.000000000 -0400 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# chkconfig: 345 91 35 ++# chkconfig: - 91 35 + # description: This package enables Linux to talk to Macintosh + # computers via the AppleTalk networking protocol and + # provides printer, file sharing, and AppleTalk routing diff --git a/netatalk.spec b/netatalk.spec index 0f57e73..a3c2db1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -20,7 +20,7 @@ Patch0: netatalk-2.0.2-db4_3.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch -Obsoletes: netatalk-1.6.4, netatalk-1.5.5 +Patch4: netatalk-2.0.3-nodefault.patch Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib @@ -49,6 +49,7 @@ Appletalk networking programs. %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator +%patch4 -p1
ln -s ./NEWS ChangeLog
@@ -178,6 +179,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Wed Jul 20 2005 Bill Nottingham notting@redhat.com +- don't run by default + * Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com - Upgrade to upstream version 2.0.3 - fix bug 160486: use netatalk's initscript
commit d0c209ab2280492e49a886d678f07b59094a51f1 Author: jvdias jvdias@fedoraproject.org Date: Thu Jun 16 23:44:00 2005 +0000
Upgrade to 2.0.3; fix bugs 160486, 89671
diff --git a/netatalk.spec b/netatalk.spec index a85c3e3..0f57e73 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -12,6 +12,7 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap +Source5: netatalk.pam_stack #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -122,7 +123,7 @@ install -m644 %{SOURCE4} . # install example config files in doc mkdir config.example cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example - +cp -fp %{SOURCE5} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
commit e41596f59e2535a8c0bbdae35c6338310ba812a8 Author: jvdias jvdias@fedoraproject.org Date: Thu Jun 16 22:32:48 2005 +0000
fix bug 123791: BuildRequires += db4-devel pam-devel
diff --git a/netatalk.spec b/netatalk.spec index 4a449e5..a85c3e3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 1 +Release: 2 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -23,7 +23,7 @@ Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf +BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel BuildRoot: %{_tmppath}/%{name}-root
%description
commit 8e4ed927a8e6b6667d6b71f0497f2510a4a948c1 Author: jvdias jvdias@fedoraproject.org Date: Thu Jun 16 21:08:02 2005 +0000
upgrade to 2.0.3; fix bug 160486
diff --git a/.cvsignore b/.cvsignore index c4fe991..abb0106 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ netatalk-1.6.4.tar.bz2 netatalk-2.0.2.tar.bz2 +netatalk-2.0.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index e672686..4a449e5 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,12 @@ %define initdir /etc/rc.d/init.d
Summary: AppleTalk networking programs -Name: netatalk -Version: 2.0.2 -Release: 3 -Epoch: 3 +Name: netatalk +Version: 2.0.3 +Release: 1 +Epoch: 4 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init #Source2: netatalk.config @@ -20,8 +20,8 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Obsoletes: netatalk-1.6.4, netatalk-1.5.5 -Url: http://netatalk.sourceforge.net/ -Prereq: /sbin/chkconfig, /sbin/service +Url: http://netatalk.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRoot: %{_tmppath}/%{name}-root @@ -95,23 +95,33 @@ make all %install rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d -mkdir -p $RPM_BUILD_ROOT%{initdir} -mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} +#mkdir -p $RPM_BUILD_ROOT/etc/pam.d +#mkdir -p $RPM_BUILD_ROOT%{initdir} +#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - -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 -install -m644 %{SOURCE4} . -install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk -cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ -cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ -rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +# +# 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%{initdir}/atalk +#cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ +#cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ chmod a-x bin/afile/acleandir.rc +rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +install -m644 %{SOURCE4} . +# +# install example config files in doc +mkdir config.example +cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example
# XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h @@ -138,14 +148,15 @@ fi %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) %config %{initdir}/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 -%attr(755,root,root) %config %{initdir}/atalk %config(noreplace) /etc/pam.d/netatalk %{_sbindir}/* %{_bindir}/* @@ -166,6 +177,10 @@ fi %{_libdir}/atalk/*.la
%changelog +* Thu Jun 16 2005 Jason Vas Dias jvdias@redhat.com +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + * Wed Mar 30 2005 Florian La Roche laroche@redhat.com - quick fix: rm -f /usr/include/netatalk/at.h until this is resolved the correct way diff --git a/sources b/sources index 26ae7eb..bde5f18 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2 -539e1f60681db40a4c4e2157854cb3eb netatalk-2.0.2.tar.bz2 +28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2
commit 5ee834fc79ee5b2932a8232f47587bfd74eda267 Author: Florian La Roche laroche@fedoraproject.org Date: Wed Mar 30 17:45:05 2005 +0000
- quickhack for fileconflict with glibc-headers
diff --git a/netatalk.spec b/netatalk.spec index 37f569a..e672686 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 -Release: 2 +Release: 3 Epoch: 3 License: GPL Group: System Environment/Daemons @@ -113,6 +113,9 @@ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* chmod a-x bin/afile/acleandir.rc
+# XXX bad hack until this file is updated in glibc-headers: +rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h + %clean rm -rf $RPM_BUILD_ROOT
@@ -163,6 +166,10 @@ fi %{_libdir}/atalk/*.la
%changelog +* Wed Mar 30 2005 Florian La Roche laroche@redhat.com +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + * Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com - Fix for gcc4 compilation: extern_ucreator.patch
@@ -322,7 +329,7 @@ fi - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. * Thu Apr 22 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp -- Correct librpcsvc.patch. Move %changelog section last. +- 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@ma.ns.musashi-tech.ac.jp
commit 244f4c5f1b9f3ed264414bb39faa08aee4220312 Author: jvdias jvdias@fedoraproject.org Date: Mon Mar 7 20:53:21 2005 +0000
Fix for gcc4 compilation: extern_ucreator.patch
diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch new file mode 100644 index 0000000..3eaab67 --- /dev/null +++ b/netatalk-2.0.2-extern_ucreator.patch @@ -0,0 +1,11 @@ +--- netatalk-2.0.2/etc/afpd/desktop.c.extern_ucreator 2004-10-09 08:48:21.000000000 -0400 ++++ netatalk-2.0.2/etc/afpd/desktop.c 2005-03-07 15:44:07.000000000 -0500 +@@ -310,7 +310,7 @@ + } + + static u_char utag[] = { 0, 0, 0, 0 }; +-static u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ ++u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ + static u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ + static short usize = 256; + static u_char uicon[] = { diff --git a/netatalk.spec b/netatalk.spec index b4cf560..37f569a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 -Release: 1 +Release: 2 Epoch: 3 License: GPL Group: System Environment/Daemons
commit fac99a2202357e642409ea90152563a5abf240ec Author: jvdias jvdias@fedoraproject.org Date: Mon Mar 7 20:52:32 2005 +0000
Fix for gcc4 compilation: extern_ucreator.patch
diff --git a/netatalk.spec b/netatalk.spec index 7f91381..b4cf560 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -4,7 +4,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 Release: 1 -Epoch: 2 +Epoch: 3 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -18,6 +18,7 @@ Source4: ICDumpSuffixMap Patch0: netatalk-2.0.2-db4_3.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch +Patch3: netatalk-2.0.2-extern_ucreator.patch Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service @@ -46,6 +47,8 @@ Appletalk networking programs. %patch0 -p1 -b .db4_3 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie +%patch3 -p1 -b .extern_ucreator + ln -s ./NEWS ChangeLog
%build @@ -160,6 +163,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Mon Mar 07 2005 Jason Vas Dias jvdias@redhat.com +- Fix for gcc4 compilation: extern_ucreator.patch + * Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com - Upgraded to upstream version 2.0.2 .
commit 37396dfdf24797fd7a671ab41addbb314521791d Author: jvdias jvdias@fedoraproject.org Date: Mon Feb 21 22:59:37 2005 +0000
Upgrade to upstream version 2.0.2
diff --git a/netatalk.spec b/netatalk.spec index 0c4277b..7f91381 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -55,12 +55,12 @@ aclocal -I macros automake --add-missing autoconf autoheader +export CFLAGS="$RPM_OPT_FLAGS" %ifnarch x86_64 -export CFLAGS="$RPM_OPT_FLAGS -fPIE" -%else -export CFLAGS="$RPM_OPT_FLAGS -fPIC" -%endif +# 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
commit b32e39fb36330b9fe3ea13f63e17b09b75a9bc33 Author: jvdias jvdias@fedoraproject.org Date: Mon Feb 21 21:21:02 2005 +0000
Upgrade to upstream version 2.0.2
diff --git a/.cvsignore b/.cvsignore index 94c6fa6..c4fe991 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ netatalk-1.6.4.tar.bz2 +netatalk-2.0.2.tar.bz2 diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch new file mode 100644 index 0000000..a4fd7ea --- /dev/null +++ b/netatalk-2.0.2-db4_2-db4_3.patch @@ -0,0 +1,30 @@ +--- netatalk-2.0.2/etc/cnid_dbd/dbif.c.db4_2-db4_3 2004-12-21 08:36:12.000000000 -0500 ++++ netatalk-2.0.2/etc/cnid_dbd/dbif.c 2005-02-21 13:21:45.000000000 -0500 +@@ -514,10 +514,10 @@ + DB_BTREE_STAT *sp; + DB *db = db_table[dbi].db; + +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + +--- netatalk-2.0.2/bin/cnid/cnid_index.c.db4_2-db4_3 2005-01-03 08:49:55.000000000 -0500 ++++ netatalk-2.0.2/bin/cnid/cnid_index.c 2005-02-21 13:23:12.000000000 -0500 +@@ -274,10 +274,10 @@ + DB_BTREE_STAT *sp; + DB *db = db_table[dbi].db; + +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch new file mode 100644 index 0000000..09ab725 --- /dev/null +++ b/netatalk-2.0.2-uams_no_pie.patch @@ -0,0 +1,20 @@ +--- netatalk-2.0.2/etc/uams/Makefile.am.uams_no_pie 2004-08-10 23:11:07.000000000 -0400 ++++ netatalk-2.0.2/etc/uams/Makefile.am 2005-02-21 14:30:23.000000000 -0500 +@@ -1,5 +1,5 @@ + # Makefile.am for etc/uams/ +- ++LDFLAGS = + SUBDIRS = uams_krb4 + + # +--- netatalk-2.0.2/macros/gssapi-check.m4.uams_no_pie 2004-06-18 03:57:19.000000000 -0400 ++++ netatalk-2.0.2/macros/gssapi-check.m4 2005-02-21 14:58:26.000000000 -0500 +@@ -126,7 +126,7 @@ + if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then + AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) + AC_MSG_RESULT([yes]) +- GSSAPI_LIBS="$LDFLAGS $LIBS" ++ GSSAPI_LIBS="$LIBS" + else + AC_MSG_RESULT([no]) + if test x"$compilegssapi" = x"yes"; then diff --git a/netatalk.spec b/netatalk.spec index 5da5ef0..0c4277b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -55,7 +55,11 @@ aclocal -I macros automake --add-missing autoconf autoheader +%ifnarch x86_64 export CFLAGS="$RPM_OPT_FLAGS -fPIE" +%else +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" %ifarch ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fsigned-char" diff --git a/sources b/sources index 154d50c..26ae7eb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2 +539e1f60681db40a4c4e2157854cb3eb netatalk-2.0.2.tar.bz2
commit 09fd47fb90dc82db2eefc6606b8f5529f87d4761 Author: jvdias jvdias@fedoraproject.org Date: Mon Feb 21 20:53:29 2005 +0000
Upgrade to upstream version 2.0.2
diff --git a/netatalk.spec b/netatalk.spec index 7245326..5da5ef0 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -156,6 +156,9 @@ fi %{_libdir}/atalk/*.la
%changelog +* Mon Feb 21 2005 Jason Vas Dias jvdias@redhat.com +- Upgraded to upstream version 2.0.2 . + * Tue Jun 15 2004 Elliot Lee sopwith@redhat.com - rebuilt
commit ffdfbdc42804d3ec25fe677d9b1e04b0d8d70464 Author: jvdias jvdias@fedoraproject.org Date: Mon Feb 21 20:42:29 2005 +0000
Upgrade to upstream version 2.0.2
diff --git a/netatalk.spec b/netatalk.spec index 403f863..7245326 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -4,6 +4,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 Release: 1 +Epoch: 2 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2
commit 69ac297e5b2ba59078dc055bbad243b9218bcf3a Author: jvdias jvdias@fedoraproject.org Date: Mon Feb 21 20:40:30 2005 +0000
Upgrade to upstream version 2.0.2
diff --git a/netatalk.spec b/netatalk.spec index fd02613..403f863 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,8 +2,8 @@
Summary: AppleTalk networking programs Name: netatalk -Version: 1.6.4 -Release: 3 +Version: 2.0.2 +Release: 1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -11,11 +11,13 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Patch0: netatalk-1.6.3-norc.patch +#Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch -Epoch: 2 -Obsoletes: netatalk-1.5.5 +Patch0: netatalk-2.0.2-db4_3.patch +Patch1: netatalk-2.0.2-db4_2-db4_3.patch +Patch2: netatalk-2.0.2-uams_no_pie.patch +Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib @@ -37,9 +39,13 @@ Appletalk networking programs.
%prep %setup -q -%patch0 -p 1 -b .norc +#%patch0 -p 1 -b .norc #%patch1 -p 1 -b .openssl097 #%patch2 -p1 -b .pathcat +%patch0 -p1 -b .db4_3 +%patch1 -p1 -b .db4_2-db4_3 +%patch2 -p1 -b .uams_no_pie +ln -s ./NEWS ChangeLog
%build touch AUTHORS @@ -48,10 +54,25 @@ aclocal -I macros automake --add-missing autoconf autoheader -CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ - --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ - --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ - --with-uams-path=%{_libdir} +export CFLAGS="$RPM_OPT_FLAGS -fPIE" +export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" +%ifarch ppc ppc64 s390 s390x +export CFLAGS="$CFLAGS -fsigned-char" +%endif +%configure \ + --with-pkgconfdir=/etc/atalk/ \ + --with-cracklib \ + --with-pam \ + --with-shadow \ + --with-tcp-wrappers \ + --with-ssl \ + --with-flock-locksi \ + --with-uams-path=%{_libdir}/atalk \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ + --with-gnu-ld \ + --enable-redhat
# Grrrr. Fix broken libtool/autoFOO Makefiles. if [ "%{_lib}" != lib ]; then @@ -66,7 +87,6 @@ make all %install rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/atalk/{uams,nls} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT%{initdir} mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} @@ -79,21 +99,11 @@ 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 install -m644 %{SOURCE4} . -#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ - -rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : - -cd $RPM_BUILD_ROOT/etc/atalk/nls -$RPM_BUILD_ROOT/usr/bin/makecode || true - -# Remove .la files in buildroot -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \ - $RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1* +rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +chmod a-x bin/afile/acleandir.rc
%clean rm -rf $RPM_BUILD_ROOT @@ -114,12 +124,10 @@ fi
%files %defattr(-,root,root) -%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc +%doc bin/afile/acleandir.rc %dir /etc/atalk -%dir /etc/atalk/nls -%config /etc/atalk/nls/* -%{_libdir}/*.so %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf @@ -132,14 +140,19 @@ fi %{_bindir}/* %{_mandir}/man*/* %{_datadir}/netatalk +%{_libdir}/atalk/*.so +%{_libexecdir}/*
%files devel %defattr(-,root,root) %dir %{_includedir}/atalk %{_libdir}/*.a +%{_libdir}/*.la %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 +%{_libdir}/atalk/*.a +%{_libdir}/atalk/*.la
%changelog * Tue Jun 15 2004 Elliot Lee sopwith@redhat.com
commit 960e4bcfd26bb2f5ee42967d75dec60e41fa6535 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:10:30 2004 +0000
auto-import changelog data from netatalk-1.6.4-3.src.rpm Tue Jun 15 2004 Elliot Lee sopwith@redhat.com - rebuilt
diff --git a/netatalk.spec b/netatalk.spec index 7d058f4..fd02613 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.6.4 -Release: 2.1 +Release: 3 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -142,6 +142,9 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Tue Jun 15 2004 Elliot Lee sopwith@redhat.com +- rebuilt + * Tue Mar 02 2004 Elliot Lee sopwith@redhat.com - rebuilt
commit befe7e7cac7370d22605b398323730330e0424fa Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:10:21 2004 +0000
auto-import changelog data from netatalk-1.6.4-2.1.src.rpm Tue Mar 02 2004 Elliot Lee sopwith@redhat.com - rebuilt Fri Feb 13 2004 Elliot Lee sopwith@redhat.com - rebuilt
diff --git a/netatalk.spec b/netatalk.spec index d74bc58..7d058f4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.6.4 -Release: 1 +Release: 2.1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -142,6 +142,12 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Tue Mar 02 2004 Elliot Lee sopwith@redhat.com +- rebuilt + +* Fri Feb 13 2004 Elliot Lee sopwith@redhat.com +- rebuilt + * Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de - 1.6.4
commit 1e73502496efd9af90389bd51c9ac8ae2d35e49a Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:09:27 2004 +0000
auto-import changelog data from netatalk-1.6.4-1.src.rpm Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de - 1.6.4 Fri Aug 01 2003 Charlie Bennett ccb@redhat.com - Update with 1.6.3 upstream sources
diff --git a/.cvsignore b/.cvsignore index a0d59f9..94c6fa6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.5.tar.bz2 +netatalk-1.6.4.tar.bz2 diff --git a/netatalk-1.6.3-norc.patch b/netatalk-1.6.3-norc.patch new file mode 100644 index 0000000..0c4c7d3 --- /dev/null +++ b/netatalk-1.6.3-norc.patch @@ -0,0 +1,20 @@ +--- netatalk-1.6.3/bin/afile/Makefile.in.norc 2003-06-12 19:07:40.000000000 -0400 ++++ netatalk-1.6.3/bin/afile/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -184,7 +184,6 @@ + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys + + bin_PROGRAMS = afile achfile +-bin_SCRIPTS = acleandir.rc + + afile_SOURCES = afile.c common.c common.h + achfile_SOURCES = achfile.c common.c common.h +--- netatalk-1.6.3/man/man1/Makefile.in.norc 2003-06-09 11:59:12.000000000 -0400 ++++ netatalk-1.6.3/man/man1/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -188,7 +188,6 @@ + GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 + TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl) + NONGENERATED_MANS = achfile.1 \ +- acleandir.1 \ + aecho.1 \ + afile.1 \ + afppasswd.1 \ diff --git a/netatalk.spec b/netatalk.spec index d94fa94..d74bc58 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,24 +2,24 @@
Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.5 -Release: 9 +Version: 1.6.4 +Release: 1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init -Source2: netatalk.config -Source3: AppleVolumes.system +#Source2: netatalk.config +#Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Patch0: netatalk-1.5.3.1-norc.patch -Patch1: netatalk-1.5.5-openssl097.patch -Patch2: netatalk-1.5.5-pathcat.patch +Patch0: netatalk-1.6.3-norc.patch +#Patch1: netatalk-1.5.5-openssl097.patch +#Patch2: netatalk-1.5.5-pathcat.patch Epoch: 2 -Obsoletes: netatalk-1.4b2+asun +Obsoletes: netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake14 autoconf +BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRoot: %{_tmppath}/%{name}-root
%description @@ -38,14 +38,14 @@ Appletalk networking programs. %prep %setup -q %patch0 -p 1 -b .norc -%patch1 -p 1 -b .openssl097 -%patch2 -p1 -b .pathcat +#%patch1 -p 1 -b .openssl097 +#%patch2 -p1 -b .pathcat
%build touch AUTHORS libtoolize --force -aclocal-1.4 -I macros -automake-1.4 --add-missing +aclocal -I macros +automake --add-missing autoconf autoheader CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ @@ -79,8 +79,8 @@ 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 install -m644 %{SOURCE4} . -install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf +#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system +#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ @@ -114,7 +114,7 @@ fi
%files %defattr(-,root,root) -%doc CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %dir /etc/atalk %dir /etc/atalk/nls @@ -142,6 +142,12 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Wed Jan 07 2004 Florian La Roche Florian.LaRoche@redhat.de +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett ccb@redhat.com +- Update with 1.6.3 upstream sources + * Tue Jul 29 2003 Elliot Lee sopwith@redhat.com - Rebuild - Fix perl multilib path editing diff --git a/sources b/sources index 12174ca..154d50c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93ec251d47f355c99daad19de0b40eb2 netatalk-1.5.5.tar.bz2 +8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2
commit c036a8ff40ce83671c4652f2862365f0e1c93df4 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:09:20 2004 +0000
auto-import changelog data from netatalk-1.5.5-9.src.rpm Tue Jul 29 2003 Elliot Lee sopwith@redhat.com - Rebuild - Fix perl multilib path editing - Add pathcat patch Thu May 01 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 - Make multilib generic - Add builddep on quota (for rpcsvc/rquota.h)
diff --git a/netatalk.spec b/netatalk.spec index 74ce8da..d94fa94 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,9 +1,9 @@ -%define initdir /etc/rc.d/init.d + %define initdir /etc/rc.d/init.d
Summary: AppleTalk networking programs Name: netatalk Version: 1.5.5 -Release: 6 +Release: 9 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -13,12 +13,13 @@ Source3: AppleVolumes.system Source4: ICDumpSuffixMap Patch0: netatalk-1.5.3.1-norc.patch Patch1: netatalk-1.5.5-openssl097.patch +Patch2: netatalk-1.5.5-pathcat.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib, openssl-devel, pam +BuildRequires: cracklib openssl-devel pam quota libtool automake14 autoconf BuildRoot: %{_tmppath}/%{name}-root
%description @@ -38,17 +39,27 @@ Appletalk networking programs. %setup -q %patch0 -p 1 -b .norc %patch1 -p 1 -b .openssl097 +%patch2 -p1 -b .pathcat
%build +touch AUTHORS +libtoolize --force +aclocal-1.4 -I macros +automake-1.4 --add-missing +autoconf +autoheader CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ --with-uams-path=%{_libdir}
# Grrrr. Fix broken libtool/autoFOO Makefiles. -%ifarch x86_64 -perl -pi -e 's/-L/usr/lib/-L/usr/lib64/g' Makefile */Makefile */*/Makefile */*/*/Makefile -%endif +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 all
@@ -81,6 +92,8 @@ $RPM_BUILD_ROOT/usr/bin/makecode || true
# Remove .la files in buildroot rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \ + $RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1*
%clean rm -rf $RPM_BUILD_ROOT @@ -129,6 +142,15 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Tue Jul 29 2003 Elliot Lee sopwith@redhat.com +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee sopwith@redhat.com 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + * Wed Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 - fix initscript error (#82118)
commit aeac6e0b1a251b3f4122de985b5ef1128e747619 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:08:50 2004 +0000
auto-import changelog data from netatalk-1.5.5-6.src.rpm Tue Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 - fix initscript error (#82118) Wed Jan 22 2003 Tim Powers timp@redhat.com - rebuilt Tue Jan 07 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 - patch for compile errors with new ssl libs - rebuild Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de - postun should never fail Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 - Updated to 1.5.5
diff --git a/.cvsignore b/.cvsignore index c493109..a0d59f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.3.1.tar.bz2 +netatalk-1.5.5.tar.bz2 diff --git a/atalk.init b/atalk.init index 87751d2..817c16e 100644 --- a/atalk.init +++ b/atalk.init @@ -14,7 +14,7 @@ . /etc/sysconfig/network
# Source Appletalk configuration -. /etc/atalk/config +. /etc/atalk/netatalk.conf
# Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 diff --git a/netatalk.spec b/netatalk.spec index 0956771..74ce8da 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,8 +2,8 @@
Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.3.1 -Release: 4 +Version: 1.5.5 +Release: 6 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -12,6 +12,7 @@ Source2: netatalk.config Source3: AppleVolumes.system Source4: ICDumpSuffixMap Patch0: netatalk-1.5.3.1-norc.patch +Patch1: netatalk-1.5.5-openssl097.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ @@ -36,13 +37,19 @@ Appletalk networking programs. %prep %setup -q %patch0 -p 1 -b .norc +%patch1 -p 1 -b .openssl097
%build -CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ --with-uams-path=%{_libdir} - + +# Grrrr. Fix broken libtool/autoFOO Makefiles. +%ifarch x86_64 +perl -pi -e 's/-L/usr/lib/-L/usr/lib64/g' Makefile */Makefile */*/Makefile */*/*/Makefile +%endif + make all
%install @@ -62,7 +69,7 @@ install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk install -m644 %{SOURCE4} . install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/config +install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ @@ -72,6 +79,9 @@ rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : cd $RPM_BUILD_ROOT/etc/atalk/nls $RPM_BUILD_ROOT/usr/bin/makecode || true
+# Remove .la files in buildroot +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT
@@ -86,12 +96,12 @@ fi
%postun if [ "$1" -ge "1" ]; then - /sbin/service atalk condrestart > /dev/null 2>&1 + /sbin/service atalk condrestart > /dev/null 2>&1 || : fi
%files %defattr(-,root,root) -%doc BUGS CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %dir /etc/atalk %dir /etc/atalk/nls @@ -99,7 +109,7 @@ fi %{_libdir}/*.so %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system -%config(noreplace) /etc/atalk/config +%config(noreplace) /etc/atalk/netatalk.conf %config(noreplace) /etc/atalk/afpd.conf %config(noreplace) /etc/atalk/atalkd.conf %config(noreplace) /etc/atalk/papd.conf @@ -119,6 +129,22 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Wed Feb 18 2003 Bill Nottingham notting@redhat.com 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers timp@redhat.com +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai nalin@redhat.com 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuild + +* Mon Dec 02 2002 Florian La Roche Florian.LaRoche@redhat.de +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch pknirsch@redhat.com 1.5.5-1 +- Updated to 1.5.5 + * Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 - Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) - Fixed missing /usr/share/netatalk dir (#67222) @@ -217,7 +243,7 @@ fi * Thu Dec 16 1999 Tim Powers timp@redhat.com - renewed source so it is pristine, delete the problematic files in spec file instead -- general spec file cleanups, create buildroot and dirs in the %install +- general spec file cleanups, create buildroot and dirs in the %%install section - strip binaries - gzip man pages diff --git a/sources b/sources index 83f96e8..12174ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d9fe0fce60bccb1264fdbb42fa1465b netatalk-1.5.3.1.tar.bz2 +93ec251d47f355c99daad19de0b40eb2 netatalk-1.5.5.tar.bz2
commit a6dd7fa958db6d5cad3f2192822ee174be0687f2 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:08:46 2004 +0000
auto-import netatalk-1.5.3.1-4 from netatalk-1.5.3.1-4.src.rpm
diff --git a/netatalk.spec b/netatalk.spec index 1df7c65..0956771 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.5.3.1 -Release: 3 +Release: 4 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 @@ -108,6 +108,7 @@ fi %{_sbindir}/* %{_bindir}/* %{_mandir}/man*/* +%{_datadir}/netatalk
%files devel %defattr(-,root,root) @@ -118,8 +119,9 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog -* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-3 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] +* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222)
* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 - automated rebuild
commit 973964e1804cfc5ea2e325eaced276c945c592b0 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:08:42 2004 +0000
auto-import changelog data from netatalk-1.5.3.1-3.src.rpm Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-3 - Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 - automated rebuild Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 - Updated to latest version 1.5.3.1. - Fixed bug for nls file lookup (#66300). Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 - Fixed initscript bug where you can't use blanks inside of names (#64926).
diff --git a/.cvsignore b/.cvsignore index f085180..c493109 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.2.tar.gz +netatalk-1.5.3.1.tar.bz2 diff --git a/atalk.init b/atalk.init index af2b172..87751d2 100644 --- a/atalk.init +++ b/atalk.init @@ -31,7 +31,7 @@ start() { daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + daemon afpd -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi } >/dev/null & else @@ -42,7 +42,7 @@ start() { daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + daemon afpd -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi fi echo diff --git a/netatalk.spec b/netatalk.spec index e424d31..1df7c65 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,15 +2,16 @@
Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.2 +Version: 1.5.3.1 Release: 3 License: GPL Group: System Environment/Daemons -Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.gz +Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.bz2 Source1: atalk.init Source2: netatalk.config Source3: AppleVolumes.system Source4: ICDumpSuffixMap +Patch0: netatalk-1.5.3.1-norc.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ @@ -34,11 +35,13 @@ Appletalk networking programs.
%prep %setup -q +%patch0 -p 1 -b .norc
%build CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ - --with-cracklib --with-pam --with-shadow --with-tcp-wrappers \ - --with-ssl --with-flock-locksi --with-uams-path=%{_libdir} + --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ + --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ + --with-uams-path=%{_libdir}
make all
@@ -115,7 +118,20 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog -* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com +* Tue Jun 25 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-3 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] + +* Fri Jun 21 2002 Tim Powers timp@redhat.com 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch pknirsch@redhat.com 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com 1.5.2-3 - Fixed initscript to use correct config files from /etc/atalk (#62803) - Changed initscript to use $0 instead of direct string (#61734) - Change Copyright to Licencse and switch from BSD to GPL (#61746) diff --git a/sources b/sources index 7971316..83f96e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9355653d6b2c18f10d1be02624db65f6 netatalk-1.5.2.tar.gz +7d9fe0fce60bccb1264fdbb42fa1465b netatalk-1.5.3.1.tar.bz2
commit 808cded35815b5dcf66f079ded3207b270039c70 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:08:31 2004 +0000
auto-import changelog data from netatalk-1.5.2-3.src.rpm Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com - Fixed initscript to use correct config files from /etc/atalk (#62803) - Changed initscript to use $0 instead of direct string (#61734) - Change Copyright to Licencse and switch from BSD to GPL (#61746)
diff --git a/atalk.init b/atalk.init index cbf3ece..af2b172 100644 --- a/atalk.init +++ b/atalk.init @@ -24,25 +24,25 @@ start() { if [ ${ATALK_BGROUND} = yes ] ; then echo -n "(backgrounded)" { - daemon atalkd + daemon atalkd -f /etc/atalk/atalkd.conf nbprgstr -p 4 "${ATALK_NAME}:Workstation" nbprgstr -p 4 "${ATALK_NAME}:netatalk" if [ ${PAPD_RUN} = yes ] ; then - daemon papd + daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi } >/dev/null & else - daemon atalkd + daemon atalkd -f /etc/atalk/atalkd.conf nbprgstr -p 4 "${ATALK_NAME}:Workstation" nbprgstr -p 4 "${ATALK_NAME}:netatalk" if [ ${PAPD_RUN} = yes ] ; then - daemon papd + daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi fi echo @@ -51,11 +51,11 @@ start() {
stop() { echo -n $"Shutting down AppleTalk services: " - killall afpd - killall papd + killproc afpd + killproc papd nbpunrgstr "${ATALK_NAME}:Workstation@*" nbpunrgstr "${ATALK_NAME}:netatalk@*" - killall atalkd + killproc atalkd # Attempt to zap the module, so that we can restart the # Appletalk daemons cleanly if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then @@ -88,7 +88,7 @@ case "$1" in status atalkd ;; *) - echo $"Usage: atalk {start|stop|restart|status|condrestart}" + echo $"Usage: $0 {start|stop|restart|status|condrestart}" exit 1 esac
diff --git a/netatalk.spec b/netatalk.spec index 396f9fb..e424d31 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,8 +3,8 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.5.2 -Release: 2 -Copyright: BSD +Release: 3 +License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.gz Source1: atalk.init @@ -115,6 +115,11 @@ fi %{_datadir}/aclocal/netatalk.m4
%changelog +* Wed Apr 10 2002 Phil Knirsch pknirsch@redhat.com +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + * Thu Mar 14 2002 Bill Nottingham notting@redhat.com - don't run by default
commit 303281c9b97a39cb914726b67921e01b80d14922 Author: cvsdist cvsdist@fedoraproject.org Date: Thu Sep 9 09:08:20 2004 +0000
auto-import changelog data from netatalk-1.5.2-2.src.rpm Thu Mar 14 2002 Bill Nottingham notting@redhat.com - don't run by default Wed Mar 13 2002 Bill Nottingham notting@redhat.com - it's back Fri Mar 02 2001 Tim Powers timp@redhat.com - rebuilt against openssl-0.9.6-1 Sun Feb 25 2001 Tim Powers timp@redhat.com - fixed bug 29370. This package is trying to include a file glibc already includes Tue Jan 23 2001 Tim Powers timp@redhat.com - updated initscript Thu Jan 04 2001 Than Ngo than@redhat.com - fixed uams-path - added noreplace to %config Mon Nov 20 2000 Tim Powers timp@redhat.com - rebuilt to fix bad dir perms Fri Nov 10 2000 Than Ngo than@redhat.com - update to 1.5pre2 (bug #19737, #20397) - update Url and ftp site - clean up specfile - netatalk-1.4b2+asun obsolete Mon Aug 07 2000 Than Ngo than@redhat.de - fix dependency with glibc-devel (Bug #15589) - fix typo in description (Bug #15479) Wed Aug 02 2000 Tim Powers timp@redhat.com - fix symlinks not being relative. Fri Jul 28 2000 Than Ngo than@redhat.de - add missing restart function in startup script Fri Jul 28 2000 Tim Powers timp@redhat.com - fixed initscripts so that condrestart doesn't return 1 when the test fails Mon Jul 24 2000 Prospector prospector@redhat.com - rebuilt Sun Jul 23 2000 Tim Powers timp@redhat.com - rebuilt Mon Jul 17 2000 Tim Powers timp@redhat.com - inits back to rc.d/init.d, using service to start inits Wed Jul 12 2000 Than Ngo than@redhat.de - rebuilt Thu Jul 06 2000 Tim Powers timp@redhat.com - fixed broken PreReq, now PreReq's /etc/init.d Tue Jun 27 2000 Than Ngo than@redhat.de - remove prereq initscripts, add requires initscripts - clean up specfile Mon Jun 26 2000 Than Ngo than@redhat.de - /etc/rc.d/init.d -> /etc/init.d - add condrestart directive - fix post/preun/postun scripts - prereq initscripts >= 5.20 Tue Jun 20 2000 Tim Powers timp@redhat.com - fixed bug 11420 concerning the building with -O2. Thu Jun 08 2000 Tim Powers timp@redhat.com - fix bug #11978 - fix man page locations to be FHS compliant Thu Jun 01 2000 Nalin Dahyabhai nalin@redhat.com - modify PAM setup to use system-auth Thu Dec 16 1999 Tim Powers timp@redhat.com - renewed source so it is pristine, delete the problematic files in spec file instead - general spec file cleanups, create buildroot and dirs in the %install section - strip binaries - gzip man pages - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too - changed group - added %defattr to %files section Tue Aug 03 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp - Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. Sat Mar 20 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp - Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping containd in Internet Config Preference. Tue Mar 02 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - [asun2.1.3] Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-8] Sun Feb 07 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-6] Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2-3] Thu Dec 17 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - [pre-asun2.1.2] Remove crlf patch. It is now a server's option. Thu Dec 03 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.1-3 source. Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.1-2 source. Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Fix rcX.d's symbolic links. Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. Sat Oct 24 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. Mon Oct 05 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-10a source. Sat Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-8 source. Add chkconfig support. Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Comment out -DCRLF. Use RPM_OPT_FLAGS. Tue Sep 08 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. Sat Aug 22 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-6 source. Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use pre-asun2.1.0-5 source. Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp - Use pre-asun2.1.0-3 source. Tue Jul 07 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Add afpovertcp entries to /etc/services - Remove BuildRoot in man8 pages Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp - Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun asun@saul9.u.washington.edu to provide an AppleShareIP file server - Included AppleVolumes.system file maintained by Johnson johnson@stpt.usf.edu Mon Aug 25 1997 David Gibson D.Gibson@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@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. - 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@zorak.gsfc.nasa.gov Updated for /etc/pam.d
diff --git a/.cvsignore b/.cvsignore index e69de29..f085180 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +netatalk-1.5.2.tar.gz diff --git a/ICDumpSuffixMap b/ICDumpSuffixMap new file mode 100644 index 0000000..3a8283f --- /dev/null +++ b/ICDumpSuffixMap @@ -0,0 +1 @@ +#!perl # # ICDumpMap # --- Dump suffix mappings from your Internet Config extension. # # iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp #
use Mac::InternetConfig;
open MAP, ">AppleVolumes"; printf MAP "%-9s "%4s" "%4s" %-30s %-25s %-15s\n\n", ".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain"; print MAP "# The following lines are extracted from Internet Config Preference.\n\n"; for my $entry (keys %InternetConfigMap) { next unless $entry->extension =~ /^./; $_ = sprintf "%-9s "%4s" "%4s" %-30s %-25s %-15s", $entry->extension, $entry->file_type, $entry->file_creator, $entry->entry_name, $entry->creator_app_name, $entry->MIME_type; s/\s*$/\n/; print MAP; } close MAP; \ No newline at end of file diff --git a/atalk.init b/atalk.init new file mode 100644 index 0000000..cbf3ece --- /dev/null +++ b/atalk.init @@ -0,0 +1,95 @@ +#!/bin/sh +# chkconfig: - 91 35 +# 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. +# processname: atalkd +# pidfile: /var/run/atalkd.pid +# config: /etc/atalk/* + +# Source function library. +. /etc/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Source Appletalk configuration +. /etc/atalk/config + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +start() { + echo -n $"Starting AppleTalk services: " + if [ ${ATALK_BGROUND} = yes ] ; then + echo -n "(backgrounded)" + { + daemon atalkd + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + fi + } >/dev/null & + else + daemon atalkd + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + fi + fi + echo + touch /var/lock/subsys/atalk +} + +stop() { + echo -n $"Shutting down AppleTalk services: " + killall afpd + killall papd + nbpunrgstr "${ATALK_NAME}:Workstation@*" + nbpunrgstr "${ATALK_NAME}:netatalk@*" + killall atalkd + # Attempt to zap the module, so that we can restart the + # Appletalk daemons cleanly + if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then + modprobe -r appletalk + fi + rm -f /var/lock/subsys/atalk + echo "" +} + + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + condrestart) + [ -f /var/lock/subsys/atalk ] && restart || : + ;; + status) + status atalkd + ;; + *) + echo $"Usage: atalk {start|stop|restart|status|condrestart}" + exit 1 +esac + +exit 0 diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..396f9fb --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,288 @@ +%define initdir /etc/rc.d/init.d + +Summary: AppleTalk networking programs +Name: netatalk +Version: 1.5.2 +Release: 2 +Copyright: BSD +Group: System Environment/Daemons +Source0: http://download.sourceforge.net/netatalk/netatalk-%%7Bversion%7D.tar.gz +Source1: atalk.init +Source2: netatalk.config +Source3: AppleVolumes.system +Source4: ICDumpSuffixMap +Epoch: 2 +Obsoletes: netatalk-1.4b2+asun +Url: http://netatalk.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service +Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib +BuildRequires: cracklib, openssl-devel, pam +BuildRoot: %{_tmppath}/%{name}-root + +%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. + +%package devel +Summary: Headers and static libraries for Appletalk development +Group: Development/Libraries + +%description devel +This package contains the header files, and static libraries for building +Appletalk networking programs. + +%prep +%setup -q + +%build +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ + --with-cracklib --with-pam --with-shadow --with-tcp-wrappers \ + --with-ssl --with-flock-locksi --with-uams-path=%{_libdir} + +make all + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT/etc/atalk/{uams,nls} +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +mkdir -p $RPM_BUILD_ROOT%{initdir} +mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} + +make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install + +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 +install -m644 %{SOURCE4} . +install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system +install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/config +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ +cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ + +rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : + +cd $RPM_BUILD_ROOT/etc/atalk/nls +$RPM_BUILD_ROOT/usr/bin/makecode || true + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add atalk + +%preun +if [ "$1" = "0" ] ; then + /sbin/service atalk stop > /dev/null 2>&1 + /sbin/chkconfig --del atalk +fi + +%postun +if [ "$1" -ge "1" ]; then + /sbin/service atalk condrestart > /dev/null 2>&1 +fi + +%files +%defattr(-,root,root) +%doc BUGS CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc ICDumpSuffixMap doc +%dir /etc/atalk +%dir /etc/atalk/nls +%config /etc/atalk/nls/* +%{_libdir}/*.so +%config(noreplace) /etc/atalk/AppleVolumes.default +%config(noreplace) /etc/atalk/AppleVolumes.system +%config(noreplace) /etc/atalk/config +%config(noreplace) /etc/atalk/afpd.conf +%config(noreplace) /etc/atalk/atalkd.conf +%config(noreplace) /etc/atalk/papd.conf +%attr(755,root,root) %config %{initdir}/atalk +%config(noreplace) /etc/pam.d/netatalk +%{_sbindir}/* +%{_bindir}/* +%{_mandir}/man*/* + +%files devel +%defattr(-,root,root) +%dir %{_includedir}/atalk +%{_libdir}/*.a +%attr(0644,root,root) %{_includedir}/atalk/* +%attr(0644,root,root) %{_includedir}/netatalk/* +%{_datadir}/aclocal/netatalk.m4 + +%changelog +* Thu Mar 14 2002 Bill Nottingham notting@redhat.com +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham notting@redhat.com +- it's back + +* Fri Mar 2 2001 Tim Powers timp@redhat.com +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers timp@redhat.com +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers timp@redhat.com +- updated initscript + +* Thu Jan 04 2001 Than Ngo than@redhat.com +- fixed uams-path +- added noreplace to %config + +* Mon Nov 20 2000 Tim Powers timp@redhat.com +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo than@redhat.com +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo than@redhat.de +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers timp@redhat.com +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo than@redhat.de +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers timp@redhat.com +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector prospector@redhat.com +- rebuilt + +* Sun Jul 23 2000 Tim Powers timp@redhat.com +- rebuilt + +* Mon Jul 17 2000 Tim Powers timp@redhat.com +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo than@redhat.de +- rebuilt + +* Thu Jul 06 2000 Tim Powers timp@redhat.com +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo than@redhat.de +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo than@redhat.de +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers timp@redhat.com +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers timp@redhat.com +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai nalin@redhat.com +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers timp@redhat.com +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %defattr to %files section + +* Tue Aug 3 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. +* Thu Apr 22 1999 iNOUE Koich! inoue@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@ma.ns.musashi-tech.ac.jp +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. +* Sat Mar 20 1999 iNOUE Koich! inoue@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@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@ma.ns.musashi-tech.ac.jp +- [asun2.1.3] +* Mon Feb 15 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-8] +* Sun Feb 7 1999 iNOUE Koich! inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-6] +* Mon Jan 25 1999 iNOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- [pre-asun2.1.2-3] +* Thu Dec 17 1998 INOUE Koichi inoue@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@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-3 source. +* Mon Nov 23 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.1-2 source. +* Mon Nov 16 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Fix rcX.d's symbolic links. +* Wed Oct 28 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. +* Sat Oct 24 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-10a source. +* Thu Sep 19 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-8 source. Add chkconfig support. +* Sat Sep 12 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Comment out -DCRLF. Use RPM_OPT_FLAGS. +* Mon Sep 8 1998 INOUE Koichi inoue@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@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-6 source. +* Mon Jul 27 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use pre-asun2.1.0-5 source. +* Tue Jul 21 1998 INOUE Koichi inoue@ma.ns.musashi-techa.c.jp +- Use pre-asun2.1.0-3 source. +* Tue Jul 7 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages +* Mon Jun 29 1998 INOUE Koichi inoue@ma.ns.musashi-tech.ac.jp +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + asun@saul9.u.washington.edu to provide an AppleShareIP file server +- Included AppleVolumes.system file maintained by Johnson + johnson@stpt.usf.edu +* Mon Aug 25 1997 David Gibson D.Gibson@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@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. +- 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@zorak.gsfc.nasa.gov +Updated for /etc/pam.d diff --git a/sources b/sources index e69de29..7971316 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9355653d6b2c18f10d1be02624db65f6 netatalk-1.5.2.tar.gz
arch-excludes@lists.fedoraproject.org