From dba9f083515f5e2d2ff02ea737353d41f5f67ce1 Mon Sep 17 00:00:00 2001 From: srittau Date: Sun, 7 Oct 2001 11:24:41 +0000 Subject: [PATCH] Sync with current Debian version. --- distrib/debian/changelog | 93 ++++++++++++++- distrib/debian/control | 11 +- distrib/debian/logcheck/ignore.d.server | 26 ++++ distrib/debian/logcheck/violations.ignore.d | 4 + distrib/debian/netatalk-dev.files | 33 +++++- distrib/debian/netatalk.dirs | 4 + distrib/debian/netatalk.examples | 2 + distrib/debian/netatalk.files | 124 +++++++++++++++----- distrib/debian/netatalk.init | 71 +++++++---- distrib/debian/netatalk.links | 1 + distrib/debian/netatalk.undocumented | 5 - distrib/debian/patches/add_printer.patch | 51 ++++++++ distrib/debian/patches/etc2ps.sh.patch | 17 +++ distrib/debian/patches/filterdir.patch | 23 ++-- distrib/debian/patches/netatalk.conf.patch | 18 +++ distrib/debian/patches/netatalk.pamd.patch | 14 +++ distrib/debian/rules | 21 ++-- 17 files changed, 427 insertions(+), 91 deletions(-) create mode 100644 distrib/debian/logcheck/ignore.d.server create mode 100644 distrib/debian/logcheck/violations.ignore.d create mode 100644 distrib/debian/netatalk.dirs create mode 100644 distrib/debian/netatalk.examples create mode 100644 distrib/debian/netatalk.links create mode 100644 distrib/debian/patches/add_printer.patch create mode 100644 distrib/debian/patches/etc2ps.sh.patch create mode 100644 distrib/debian/patches/netatalk.conf.patch create mode 100644 distrib/debian/patches/netatalk.pamd.patch diff --git a/distrib/debian/changelog b/distrib/debian/changelog index 71858a1b..2110ec7a 100644 --- a/distrib/debian/changelog +++ b/distrib/debian/changelog @@ -1,8 +1,91 @@ -netatalk (1.5pre7cvs-0) unstable; urgency=medium - - * Inofficial CVS release. - - -- Sebastian Rittau Thu, 30 Aug 2001 02:41:07 +0200 +netatalk (1.5pre8cvs-0) unstable; urgency=low + + * Unofficial CVS release. + + -- Sebastian Rittau Sun, 7 Oct 2001 13:07:23 +0200 + +netatalk (1.5pre8-1) unstable; urgency=low + + * New upstream version, containing most Debian patches. + * Added a patch to configure.in that fixes PAM detection and compilation. + + -- Sebastian Rittau Sun, 7 Oct 2001 12:46:15 +0200 + +netatalk (1.5pre7-5) unstable; urgency=low + + * More patches by Jonas Smedegaard : + + 001_logcheck_fix_typo_and_optimize... + Logcheck fixes and improvements. (Closes: #114448) + + 005_visible_home_dir_in_config_(again!) + Name user home directories "Home Directory" by default to make them + appear in the MacOS chooser. (Patch had already been applied in + 1.5pre7-2, but had been lost since.) + + Jonas made more patches, which I haven't applied yet, but either + committed upstream or sent upstream for discussion. + + -- Sebastian Rittau Thu, 4 Oct 2001 22:31:50 +0200 + +netatalk (1.5pre7-4) unstable; urgency=low + + * Fixed Build-Dependencies. (pam-cracklib -> cracklib2-dev) (Closes: #113356) + * Restored symlinks in /usr/lib/atalk/filters and other directories. + (Closes: #113746) + * Patches by Jonas Smedegaard : + + 002_correctly_calculate_perl_depends + + 003_remove_cap_line_from_logcheck + Small logcheck change. + + 004_add_misc_logcheck_lines + Another logcheck change. + + 011_strip_pam_paths + Not applied, but patched config/netatalk.pamd to strip /lib/security + from its path. + + -- Sebastian Rittau Mon, 1 Oct 2001 08:30:17 +0200 + +netatalk (1.5pre7-3) unstable; urgency=low + + * Fixed a stupid typo I made in the new init script. + * Put add_netatalk_printer and netatalkshorternamelinks.pl in the + examples directory instead of /usr/bin. Suggestion from Jonas + Smedegaard. + + -- Sebastian Rittau Sun, 23 Sep 2001 19:08:43 +0200 + +netatalk (1.5pre7-2) unstable; urgency=low + + * Integrated a lot of patches by Jonas Smedegaard : + + 001_etc2ps paths + Correct paths in etc2ps and suggest tetex-base. + + 005_visible_home_dir_in_config + Name user home directories "Home Directory" by default to make them + appear in the MacOS chooser. + + 007_logcheck + Support for the logcheck log file checking package. + + 011_avoid_symlinks_and_force_using_autoconf_2.50 + Partly applied: Patch configure.in so that the use of autoconf 2.50 + is forced. (Debian autoconf hack workaround.) + + 012_netatalk.conf + Improved init script. Also, make use of netatalk.conf again. + I patched the patch so that netatalk.conf is placed in /etc/default. + + 015_recommend_lsof_(for_macusers)_and_suggest_quota + Recommend lsof and suggest quota. + + 021_enable_ssl_and_cracklib_and_correct_pam_paths + Partly applied: Enable cracklib support. + * Fixed paths in add_netatalk_printer. + * Removed lp2pap.sh since it's of no use on Debian systems. + * Removed test_parse_mtab and afpd-mtab.pl because we are not using + the mtab DID scheme. + * Comparison operator is '=', not '==' in the 'test' command. Fixed + my patch. + * Removed netatalk.conf.5 as well, since we don't install netatalk.conf + anymore. + * Removed superfluous file /etc/netatalk/netatalk.pamd. + * Moved all *.la and *.a files to netatalk-dev. Added appropriate + conflicts and replaces. + * debian/rules: Do not copy files to package build directories instead of + removing them afterwards. + + -- Sebastian Rittau Sun, 23 Sep 2001 14:04:06 +0200 netatalk (1.5pre7-1) unstable; urgency=medium diff --git a/distrib/debian/control b/distrib/debian/control index 6b1a9555..e126733f 100644 --- a/distrib/debian/control +++ b/distrib/debian/control @@ -3,11 +3,13 @@ Section: non-US Priority: extra Maintainer: Sebastian Rittau Standards-Version: 3.5.6.0 -Build-Depends: debhelper (>= 3.0.0), libdb3-dev, libwrap0-dev, libpam0g-dev +Build-Depends: debhelper (>= 3.0.0), libdb3-dev, libwrap0-dev, libpam0g-dev, cracklib2-dev Package: netatalk Architecture: any -Depends: netbase, timeout, libpam-modules, ${shlibs:Depends} +Depends: netbase, timeout, libpam-modules, ${shlibs:Depends}, ${perl:Depends} +Recommends: lsof, libpam-cracklib +Suggests: tetex-base, quota Conflicts: netatalk-asun, libatalk14g, libatalk1 Replaces: netatalk-asun, libatalk14, libatalk1 Description: Appletalk user binaries @@ -19,10 +21,11 @@ Description: Appletalk user binaries Package: netatalk-dev Architecture: any Depends: netatalk (>= 1.5) -Conflicts: libatalk14g-dev, libatalk14-dev, netatalk-asun, libatalk1-dev -Replaces: libatalk14g-dev, libatalk14-dev, netatalk-asun, libatalk1-dev +Conflicts: netatalk (<< 1.5pre7-2), libatalk14g-dev, libatalk14-dev, netatalk-asun, libatalk1-dev +Replaces: netatalk (<< 1.5pre7-2), libatalk14g-dev, libatalk14-dev, netatalk-asun, libatalk1-dev Description: Appletalk library and development files Netatalk is an implementation of the AppleTalk Protocol Suite for BSD-derived systems. The current release contains support for EtherTalk Phase I and II, DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP. + diff --git a/distrib/debian/logcheck/ignore.d.server b/distrib/debian/logcheck/ignore.d.server new file mode 100644 index 00000000..90543d3c --- /dev/null +++ b/distrib/debian/logcheck/ignore.d.server @@ -0,0 +1,26 @@ +afpd\[.*\]: ((dhx|cleartext) )?login: [[:alnum:]]+ +afpd\[.*\]: (server_child\[[[:digit:]]+\] [[:digit:]]+ )?(done|exited 1) +afpd\[.*\]: [\.[:alnum:]]+ read, [\.[:alnum:]]+ written +afpd\[.*\]: .*: Broken pipe +afpd\[.*\]: .*: Connection reset by peer +afpd\[.*\]: .*: Connection timed out +afpd\[.*\]: .*: No route to host +afpd\[.*\]: .*: No such file or directory +afpd\[.*\]: .*: Permission denied +afpd\[.*\]: .*: child timed out +afpd\[.*\]: ASIP session:[[:digit:]]+\([[:digit:]]+\) from [\.:[:digit:]]+\([[:digit:]]+\) +afpd\[.*\]: Connection terminated +afpd\[.*\]: afp_openfork: ad_open: File Exists +afpd\[.*\]: asp_alrm: [[:digit:]]+ timed out +afpd\[.*\]: login [[:alnum:]]+ \(uid [[:digit:]]+, gid [[:digit:]]+\) +afpd\[.*\]: login noauth +afpd\[.*\]: logout [[:alnum:]]+ +afpd\[.*\]: registering [[:alnum:]]+ \(uid [[:digit:]]+\) on [\.[:digit:]]+ as /.+/net[\.[:digit:]]+node[[:digit:]]+ +afpd\[.*\]: session from [\.:[:digit:]]+ on [\.:[:digit:]]+ +afpd\[.*\]: uams_dhx_pam.c :PAM: PAM (Auth OK!|Success -- Success) +afpd\[.*\]: using codepage directory: /etc/netatalk/nls/maccode\.[\.[:alnum:]-]+ +atalkd\[.*\]: .*: Network is unreachable +atalkd\[.*\]: zip gnireply from [\.[:digit:] \(.* [[:digit:]]\) +atalkd\[.*\]: zip ignoring gnireply +papd\[.*\]: child [[:digit:]]+ for ".+" from [\.[:digit:]+]] +papd\[.*\]: child [[:digit:]]+ done diff --git a/distrib/debian/logcheck/violations.ignore.d b/distrib/debian/logcheck/violations.ignore.d new file mode 100644 index 00000000..98638a75 --- /dev/null +++ b/distrib/debian/logcheck/violations.ignore.d @@ -0,0 +1,4 @@ +afpd\[.*\]: afp_die: asp_shutdown: Connection timed out +afpd\[.*\]: afp_getsrvrparms: stat /.+/: Permission denied +afpd\[.*\]: dsi_stream_read\([[:digit:]]+\): Permission denied +afpd\[.*\]: getforkparms: (ad_refresh|of_find): Permission denied diff --git a/distrib/debian/netatalk-dev.files b/distrib/debian/netatalk-dev.files index 64f9d8c9..a4f3f2bb 100644 --- a/distrib/debian/netatalk-dev.files +++ b/distrib/debian/netatalk-dev.files @@ -1,7 +1,38 @@ usr/bin/netatalk-config -usr/include +usr/include/atalk/adouble.h +usr/include/atalk/aep.h +usr/include/atalk/afp.h +usr/include/atalk/asp.h +usr/include/atalk/atp.h +usr/include/atalk/cnid.h +usr/include/atalk/compat.h +usr/include/atalk/ddp.h +usr/include/atalk/dsi.h +usr/include/atalk/nbp.h +usr/include/atalk/netddp.h +usr/include/atalk/pap.h +usr/include/atalk/paths.h +usr/include/atalk/rtmp.h +usr/include/atalk/server_child.h +usr/include/atalk/uam.h +usr/include/atalk/util.h +usr/include/atalk/zip.h +usr/include/netatalk/aarp.c +usr/include/netatalk/aarp.h +usr/include/netatalk/at_control.c +usr/include/netatalk/at_proto.c +usr/include/netatalk/at_var.h +usr/include/netatalk/ddp.h +usr/include/netatalk/ddp_input.c +usr/include/netatalk/ddp_output.c +usr/include/netatalk/ddp_usrreq.c +usr/include/netatalk/ddp_var.h +usr/include/netatalk/endian.h +usr/include/netatalk/phase2.h usr/lib/libatalk.a usr/lib/libatalk.la +usr/lib/netatalk/uams_*.la +usr/lib/netatalk/uams_*.a usr/share/aclocal usr/share/man/man1/netatalk-config.1 usr/share/man/man3 diff --git a/distrib/debian/netatalk.dirs b/distrib/debian/netatalk.dirs new file mode 100644 index 00000000..b8ce9783 --- /dev/null +++ b/distrib/debian/netatalk.dirs @@ -0,0 +1,4 @@ +etc/default +etc/logcheck/ignore.d.server +etc/logcheck/ignore.d.workstation +etc/logcheck/violations.ignore.d diff --git a/distrib/debian/netatalk.examples b/distrib/debian/netatalk.examples new file mode 100644 index 00000000..3705c1cc --- /dev/null +++ b/distrib/debian/netatalk.examples @@ -0,0 +1,2 @@ +contrib/printing/add_netatalk_printer +contrib/shell_utils/netatalkshorternamelinks.pl diff --git a/distrib/debian/netatalk.files b/distrib/debian/netatalk.files index 238336f7..9e6c9218 100644 --- a/distrib/debian/netatalk.files +++ b/distrib/debian/netatalk.files @@ -1,30 +1,96 @@ -etc -usr/bin/a* -usr/bin/b* -usr/bin/c* -usr/bin/g* -usr/bin/h* -usr/bin/l* -usr/bin/m* -usr/bin/p* -usr/bin/s* -usr/bin/t* -usr/bin/u* -usr/bin/na* -usr/bin/nb* -usr/bin/nu* -usr/bin/netatalkshorternamelinks.pl -usr/lib/atalk -usr/lib/netatalk -usr/sbin -usr/share/man/man1/a* -usr/share/man/man1/g* -usr/share/man/man1/h* -usr/share/man/man1/m* -usr/share/man/man1/nb* -usr/share/man/man1/p* -usr/share/man/man1/s* -usr/share/man/man1/u* -usr/share/man/man5 -usr/share/man/man8 +etc/netatalk/AppleVolumes.default +etc/netatalk/AppleVolumes.system +etc/netatalk/afpd.conf +etc/netatalk/atalkd.conf +etc/netatalk/papd.conf +etc/netatalk/nls +etc/pam.d/netatalk +usr/bin/achfile +usr/bin/adv1tov2 +usr/bin/aecho +usr/bin/afile +usr/bin/afppasswd +usr/bin/apple_cp +usr/bin/apple_mv +usr/bin/apple_rm +usr/bin/cleanappledouble.pl +usr/bin/getzones +usr/bin/macusers +usr/bin/makecode +usr/bin/megatron +usr/bin/pap +usr/bin/papstatus +usr/bin/parsecode +usr/bin/psorder +usr/bin/nbplkup +usr/bin/nbprgstr +usr/bin/nbpunrgstr +usr/bin/nu +usr/bin/unbin +usr/bin/unhex +usr/bin/unsingle +usr/bin/hqx2bin +usr/bin/single2bin +usr/bin/macbinary +usr/bin/binheader +usr/bin/nadheader +usr/lib/atalk/filters/etc2ps.sh +usr/lib/atalk/filters/ofpap +usr/lib/atalk/filters/ifpap +usr/lib/atalk/filters/tfpap +usr/lib/atalk/filters/ifpaprev +usr/lib/atalk/filters/tfpaprev +usr/lib/atalk/filters/ofwpap +usr/lib/atalk/filters/ifwpap +usr/lib/atalk/filters/tfwpap +usr/lib/atalk/filters/ifwpaprev +usr/lib/atalk/filters/tfwpaprev +usr/lib/atalk/filters/ofmpap +usr/lib/atalk/filters/ifmpap +usr/lib/atalk/filters/tfmpap +usr/lib/atalk/filters/ifmpaprev +usr/lib/atalk/filters/tfmpaprev +usr/lib/atalk/filters/ofwmpap +usr/lib/atalk/filters/ifwmpap +usr/lib/atalk/filters/tfwmpap +usr/lib/atalk/filters/ifwmpaprev +usr/lib/atalk/filters/tfwmpaprev +usr/lib/netatalk/uams_*.so +usr/sbin/afpd +usr/sbin/atalkd +usr/sbin/papd +usr/sbin/psf +usr/sbin/psa +usr/sbin/timelord +usr/share/man/man1/aecho.1 +usr/share/man/man1/afile.1 +usr/share/man/man1/afppasswd.1 +usr/share/man/man1/getzones.1 +usr/share/man/man1/megatron.1 +usr/share/man/man1/nbp.1 +usr/share/man/man1/pap.1 +usr/share/man/man1/achfile.1 +usr/share/man/man1/acleandir.1 +usr/share/man/man1/hqx2bin.1 +usr/share/man/man1/macbinary.1 +usr/share/man/man1/nbplkup.1 +usr/share/man/man1/nbprgstr.1 +usr/share/man/man1/nbpunrgstr.1 +usr/share/man/man1/papstatus.1 +usr/share/man/man1/psorder.1 +usr/share/man/man1/single2bin.1 +usr/share/man/man1/unbin.1 +usr/share/man/man1/unhex.1 +usr/share/man/man1/unsingle.1 +usr/share/man/man5/afpd.conf.5 +usr/share/man/man5/atalkd.conf.5 +usr/share/man/man5/papd.conf.5 +usr/share/man/man5/AppleVolumes.default.5 +usr/share/man/man8/pap.8 +usr/share/man/man8/papd.8 +usr/share/man/man8/papstatus.8 +usr/share/man/man8/psf.8 +usr/share/man/man8/timelord.8 +usr/share/man/man8/afpd.8 +usr/share/man/man8/atalkd.8 usr/share/netatalk diff --git a/distrib/debian/netatalk.init b/distrib/debian/netatalk.init index 34d0b878..fe5e1c78 100644 --- a/distrib/debian/netatalk.init +++ b/distrib/debian/netatalk.init @@ -2,29 +2,50 @@ test -x /usr/sbin/atalkd || exit 0 -servername=$(/bin/hostname --short) +# Set defaults. Please change these options in /etc/default/netatalk. +AFPD_UAMLIST="-U uams_clrtxt.so,uams_randnum.so" +AFPD_GUEST=nobody +AFPD_MAX_CLIENTS=20 +ATALK_NAME=`/bin/hostname --short` -# Enable PAP (AppleTalk Printer Access Protocol) daemon -# (default yes) -ENABLE_PAP=yes +# Read in netatalk configuration. +if [ -f /etc/default/netatalk ]; then + . /etc/default/netatalk +fi + +OPTIONS_AFP="$AFPD_UAMLIST -g $AFPD_GUEST -c $AFPD_MAX_CLIENTS -n $ATALK_NAME" case "$1" in start) - echo -n "Starting AppleTalk Daemons (this will take a while):" - /usr/sbin/atalkd - echo -n " atalkd" - - /usr/bin/nbprgstr -p 4 "$servername:Workstation" - /usr/bin/nbprgstr -p 4 "$servername:netatalk" - - /usr/sbin/afpd -n "$servername" - echo -n " afpd" - - if [ "$ENABLE_PAP" = "yes" ]; then - /usr/sbin/papd - echo -n " papd" + if [ "$ATALKD_RUN" = "yes" ]; then + # Quickly probe for appletalk if it was supposed to be loaded + if grep '^appletalk$' /etc/modules; then + /sbin/modprobe appletalk || echo "[could not load appletalk module]" + fi + + echo -n "Starting AppleTalk Daemons (this will take a while):" + /usr/sbin/atalkd + echo -n " atalkd" + + /usr/bin/nbprgstr -p 4 "$ATALK_NAME:Workstation" + /usr/bin/nbprgstr -p 4 "$ATALK_NAME:netatalk" + fi + + if [ "$AFPD_RUN" = "yes" ]; then + /usr/sbin/afpd $OPTIONS_AFP + echo -n " afpd" + fi + + if [ "$ATALKD_RUN" = "yes" -a "$PAPD_RUN" = "yes" ]; then + /usr/sbin/papd + echo -n " papd" + fi + + if [ "$TIMELORD_RUN" = "yes" ]; then + /usr/sbin/timelord + echo -n " timelord" fi - + echo "." ;; @@ -33,10 +54,11 @@ case "$1" in echo -n " afpd"; \ start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/afpd - if [ -f /var/run/papd.pid ]; then - echo -n " papd"; \ - start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/papd - fi + echo -n " papd"; \ + start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/papd + + echo -n " timelord"; \ + start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/timelord echo -n " atalkd"; \ start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/atalkd @@ -54,9 +76,8 @@ case "$1" in echo -n "." sleep 2 echo -n "." - if /etc/init.d/netatalk start > /dev/null 2>&1 - then - echo "done." + if /etc/init.d/netatalk start > /dev/null 2>&1; then + echo "done." fi ;; diff --git a/distrib/debian/netatalk.links b/distrib/debian/netatalk.links new file mode 100644 index 00000000..cc129330 --- /dev/null +++ b/distrib/debian/netatalk.links @@ -0,0 +1 @@ +etc/logcheck/ignore.d.server/netatalk etc/logcheck/ignore.d.workstation/netatalk diff --git a/distrib/debian/netatalk.undocumented b/distrib/debian/netatalk.undocumented index f9c7afb3..17fede0a 100644 --- a/distrib/debian/netatalk.undocumented +++ b/distrib/debian/netatalk.undocumented @@ -1,16 +1,11 @@ -add_netatalk_printer.1 -afpd-mtab.pl.1 apple_cp.1 apple_mv.1 apple_rm.1 binheader.1 cleanappledouble.pl.1 -lp2pap.sh.1 macusers.1 makecode.1 nadheader.1 -netatalkshorternamelinks.pl.1 nu.1 parsecode.1 psa.8 -test_parse_mtab.1 diff --git a/distrib/debian/patches/add_printer.patch b/distrib/debian/patches/add_printer.patch new file mode 100644 index 00000000..bbfb908f --- /dev/null +++ b/distrib/debian/patches/add_printer.patch @@ -0,0 +1,51 @@ +--- netatalk.cvs/contrib/printing/add_netatalk_printer ++++ netatalk.debian/contrib/printing/add_netatalk_printer +@@ -43,10 +43,10 @@ + + # allow for the env NETATALKHOME to override the guessed one from above + +-NETATALKHOME=${NETATALKHOME:-$RUNHOME} ++NETATALKHOME=${NETATALKHOME:-/usr} + export NETATALKHOME + +-PATH=/bin:${PATH}:${NETATALKHOME}/bin:${NETATALKHOME}/etc:${NETATALKHOME}/etc/filters:/usr/lib:/usr/sbin ++PATH=/bin:${PATH}:${NETATALKHOME}/bin:${NETATALKHOME}/etc:${NETATALKHOME}/lib/atalk/filters:/usr/lib:/usr/sbin + + if [ ! -x ${NETATALKHOME}/bin/pap ]; then + echo "OOPS: I don't see ${NETATALKHOME}/bin/pap ," +@@ -66,7 +66,7 @@ + + echo "" + echo "Looking for LaserWriters in Zone ${ZONE} ..." +-$NETATALKHOME/bin/nbplkup ":LaserWriter@${ZONE}" ++${NETATALKHOME}/bin/nbplkup ":LaserWriter@${ZONE}" + + echo "" + echo "Enter AppleTalk printer name: \c" +@@ -80,7 +80,7 @@ + + echo "checking nbplkup ${DEST}:LaserWriter@${ZONE}" + echo "" +-TestDEST=`$NETATALKHOME/bin/nbplkup "${DEST}:LaserWriter@${ZONE}"` ++TestDEST=`${NETATALKHOME}/bin/nbplkup "${DEST}:LaserWriter@${ZONE}"` + echo "${TestDEST}" + echo "" + +@@ -237,7 +237,7 @@ + Printer types: Netatalk + Printers: any + Filter type: fast +-Command: ${NETATALKHOME}/etc/filters/ifpap 2>&1 > /dev/null ++Command: ${NETATALKHOME}/lib/atalk/filters/ifpap 2>&1 > /dev/null + EOF + chown lp:lp /etc/lp/fd/netatalk.fd + chmod 664 /etc/lp/fd/netatalk.fd +@@ -257,7 +257,7 @@ + Printer types: Netatalk-R + Printers: any + Filter type: fast +-Command: "/usr/lib/lp/postscript/postreverse | ${NETATALKHOME}/etc/filters/ifpap 2>&1 >/dev/null" ++Command: "/usr/lib/lp/postscript/postreverse | ${NETATALKHOME}/lib/atalk/filters/ifpap 2>&1 >/dev/null" + EOF + chown lp:lp /etc/lp/fd/netatalk-r.fd + chmod 664 /etc/lp/fd/netatalk-r.fd diff --git a/distrib/debian/patches/etc2ps.sh.patch b/distrib/debian/patches/etc2ps.sh.patch new file mode 100644 index 00000000..c9c76d7f --- /dev/null +++ b/distrib/debian/patches/etc2ps.sh.patch @@ -0,0 +1,17 @@ +--- netatalk.cvs/etc/psf/etc2ps.sh ++++ netatalk.debian/etc/psf/etc2ps.sh +@@ -9,11 +9,11 @@ + # tag in the case. + # + +-DVIPSPATH=/usr/local/tex/bin +-DVIPS=/usr/local/tex/bin/dvips ++DVIPSPATH=/usr/bin ++DVIPS=/usr/bin/dvips + DVIPSARGS="-f -q" + +-TROFF2PS=/usr/local/psroff/troff2/troff2ps ++TROFF2PS=/usr/bin/troff2ps + TROFF2PSARGS="-Z -O-.10" + + PATH=/usr/bin:$DVIPSPATH; export PATH diff --git a/distrib/debian/patches/filterdir.patch b/distrib/debian/patches/filterdir.patch index b9af4897..65855d90 100644 --- a/distrib/debian/patches/filterdir.patch +++ b/distrib/debian/patches/filterdir.patch @@ -1,26 +1,27 @@ ---- netatalk.cvs/etc/psf/Makefile.am Sat May 5 18:54:03 2001 -+++ netatalk.debian/etc/psf/Makefile.am Sat May 5 18:56:09 2001 -@@ -2,7 +2,10 @@ - - sbin_PROGRAMS = psf psa +--- netatalk.cvs/etc/psf/Makefile.am ++++ netatalk.debian/etc/psf/Makefile.am +@@ -1,8 +1,11 @@ + # Makefile.am for etc/psf/ +filterdir = $(libdir)/atalk/filters + + sbin_PROGRAMS = psf psa + pkgdata_DATA = pagecount.ps +filter_SCRIPTS = etc2ps.sh psf_SOURCES = psf.c psa_SOURCES = psa.c -@@ -26,9 +29,11 @@ +@@ -26,14 +29,16 @@ # install sections for links # +# srittau: We do some dirty hard-coding for Debian to maintain compability. install-exec-local: -+ mkdir -p $(DESTDIR)$(filterdir) - @list='$(psf_LINKS)'; for l in $$list; do \ -- $(LN_S) -f psf $(DESTDIR)$(sbindir)/$$l; \ -+ $(LN_S) -f ../../../sbin/psf $(DESTDIR)$(filterdir)/$$l; \ - done ++ $(mkinstalldirs) $(DESTDIR)$(filterdir) + @list='$(psf_LINKS)'; for l in $$list; do \ +- $(LN_S) -f psf $(DESTDIR)$(sbindir)/$$l; \ ++ $(LN_S) -f ../../../sbin/psf $(DESTDIR)$(filterdir)/$$l; \ + done # diff --git a/distrib/debian/patches/netatalk.conf.patch b/distrib/debian/patches/netatalk.conf.patch new file mode 100644 index 00000000..5487084e --- /dev/null +++ b/distrib/debian/patches/netatalk.conf.patch @@ -0,0 +1,18 @@ +--- netatalk.cvs/config/netatalk.conf ++++ netatalk.debian/config/netatalk.conf +@@ -6,7 +6,7 @@ + # NOTE: if you're zone has spaces in it, you're better off specifying + # it in afpd.conf + #ATALK_ZONE=@zone +-ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1` ++ATALK_NAME=`/bin/hostname --short` + + # specify this if you don't want guest, clrtxt, and dhx + # available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so, +@@ -21,6 +21,3 @@ + PAPD_RUN=yes + AFPD_RUN=yes + TIMELORD_RUN=no +- +-# Control whether the daemons are started in the background +-ATALK_BGROUND=no diff --git a/distrib/debian/patches/netatalk.pamd.patch b/distrib/debian/patches/netatalk.pamd.patch new file mode 100644 index 00000000..b1758d18 --- /dev/null +++ b/distrib/debian/patches/netatalk.pamd.patch @@ -0,0 +1,14 @@ +--- netatalk.cvs/config/netatalk.pamd ++++ netatalk.debian/config/netatalk.pamd +@@ -1,6 +1,6 @@ + #%PAM-1.0 +-auth required /lib/security/pam_unix.so +-account required /lib/security/pam_unix.so +-#password required /lib/security/pam_cracklib.so +-#password required /lib/security/pam_unix.so use_authtok +-session required /lib/security/pam_unix.so ++auth required pam_unix.so ++account required pam_unix.so ++password required pam_cracklib.so ++password required pam_unix.so use_authtok ++session required pam_unix.so diff --git a/distrib/debian/rules b/distrib/debian/rules index b2abc03b..4e364658 100755 --- a/distrib/debian/rules +++ b/distrib/debian/rules @@ -22,7 +22,9 @@ configure-stamp: ./configure --with-shadow --enable-fhs \ --sysconfdir=/etc/netatalk --with-config-dir=/etc/netatalk \ --with-tcp-wrappers --mandir=/usr/share/man --prefix=/usr \ - --enable-timelord --with-did=last --without-ssl-dir + --enable-timelord --with-did=last --without-ssl-dir \ + --with-cracklib=/var/cache/cracklib/cracklib_dict \ + --enable-overwrite touch configure-stamp @@ -51,17 +53,12 @@ install: build $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - # Remove a config file that is not used by the Debian init script. - rm debian/tmp/etc/netatalk/netatalk.conf + # Manually move a file that would get installed in the wrong place. + mv debian/tmp/etc/netatalk/netatalk.conf debian/netatalk/etc/default/netatalk - # Manually remove a header file that is shipped with glibc and - # the Linux Kernel. - rm debian/tmp/usr/include/netatalk/at.h - - # Remove /usr/bin/timeout and timeout(1) as they conflict with - # the timeout package. - rm debian/tmp/usr/bin/timeout - rm debian/tmp/usr/share/man/man1/timeout.1 + # Install logcheck files + install -m 644 debian/logcheck/ignore.d.server debian/netatalk/etc/logcheck/ignore.d.server/netatalk + install -m 644 debian/logcheck/violations.ignore.d debian/netatalk/etc/logcheck/violations.ignore.d/netatalk # Build architecture-independent files here. binary-indep: build install @@ -73,6 +70,7 @@ binary-arch: build install dh_movefiles dh_installdocs + dh_installexamples dh_installinit --update-rcd-params="defaults 50 50" dh_installman dh_undocumented @@ -84,6 +82,7 @@ binary-arch: build install dh_makeshlibs dh_installdeb dh_shlibdeps + dh_perl dh_gencontrol dh_md5sums dh_builddeb -- 2.39.2