# HG changeset patch # User Pascal Bellard # Date 1235252769 0 # Node ID 22ab8eb50d81ae7149c7bfebc3cbc9becafe56cf # Parent 297964ebacad95730d8cc8edfbd9de61ac64dd29 *-pam: remove duplicate stuff/ diff -r 297964ebacad -r 22ab8eb50d81 cyrus-sasl-pam/receipt --- a/cyrus-sasl-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/cyrus-sasl-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -31,5 +31,5 @@ cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/sasl2/*.so* $fs/usr/lib/sasl2 - cp -a stuff/etc $fs + cp -a ../$SOURCE/stuff/etc $fs } diff -r 297964ebacad -r 22ab8eb50d81 cyrus-sasl-pam/stuff/etc/init.d/cyrus-sasl --- a/cyrus-sasl-pam/stuff/etc/init.d/cyrus-sasl Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -#!/bin/sh -# /etc/init.d/cyrus-sasl : Start, stop and restart SASL server on SliTaz, at -# boot time or with the command line. -# -# To start SASL server at boot time, just put cyrus-sasl in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=cyrus-sasl -DESC="SASL server" -DAEMON=/usr/sbin/saslauthd -OPTIONS=$CYRUS_OPTIONS -PIDFILE=/var/state/saslauthd/saslauthd.pid -[ -n "$OPTIONS" ] || OPTIONS="-a shadow" - -case "$1" in - start) - if [ -f $PIDFILE ] ; then - echo "$NAME already running." - exit 1 - fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - ;; - stop) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - status - ;; - restart) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; -esac - -exit 0 diff -r 297964ebacad -r 22ab8eb50d81 dropbear-pam/receipt --- a/dropbear-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/dropbear-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -47,8 +47,8 @@ strip -s $fs/usr/sbin/* # Config file and init script. mkdir -p $fs/etc - cp -a stuff/dropbear $fs/etc - cp -a stuff/init.d $fs/etc + cp -a ../$SOURCE/stuff/dropbear $fs/etc + cp -a ../$SOURCE/stuff/init.d $fs/etc cp -a stuff/pam.d $fs/etc touch $fs/etc/dropbear/dropbear_dss_host_key \ $fs/etc/dropbear/dropbear_rsa_host_key diff -r 297964ebacad -r 22ab8eb50d81 dropbear-pam/stuff/dropbear/banner --- a/dropbear-pam/stuff/dropbear/banner Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - -Secure login on SliTaz GNU/Linux powered by Dropbear SSH server. diff -r 297964ebacad -r 22ab8eb50d81 dropbear-pam/stuff/init.d/dropbear --- a/dropbear-pam/stuff/init.d/dropbear Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -#!/bin/sh -# /etc/init.d/dropbear : Start, stop and restart SSH server on SliTaz, at -# boot time or with the command line. -# -# To start SSH server at boot time, just put dropbear in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=Dropbear -DESC="SSH server" -DAEMON=/usr/sbin/dropbear -OPTIONS=$DROPBEAR_OPTIONS -PIDFILE=/var/run/dropbear.pid - -case "$1" in - start) - # We need rsa and dss host key file to start dropbear. - if [ ! -s /etc/dropbear/dropbear_rsa_host_key ] ; then - echo -n "Generating $NAME rsa key... " - # Need to delete key before creating it. - rm -f /etc/dropbear/dropbear_rsa_host_key - dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1 - status - fi - if [ ! -s /etc/dropbear/dropbear_dss_host_key ] ; then - echo -n "Generating $NAME dss key... " - # Need to delete key before creating it. - rm -f /etc/dropbear/dropbear_dss_host_key - dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1 - status - fi - if [ -f $PIDFILE ] ; then - echo "$NAME already running." - exit 1 - fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - ;; - stop) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - status - ;; - restart) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; -esac - -exit 0 diff -r 297964ebacad -r 22ab8eb50d81 netatalk-pam/receipt --- a/netatalk-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/netatalk-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -19,7 +19,7 @@ { cd $src [ -f done.netatalk-2.0.3-newer-db.patch ] || \ - patch -p1 < ../stuff/netatalk-2.0.3-newer-db.patch + patch -p1 < ../../$SOURCE/stuff/netatalk-2.0.3-newer-db.patch touch done.netatalk-2.0.3-newer-db.patch ./configure --with-pam --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man $CONFIGURE_ARGS && diff -r 297964ebacad -r 22ab8eb50d81 netatalk-pam/stuff/netatalk-2.0.3-newer-db.patch --- a/netatalk-pam/stuff/netatalk-2.0.3-newer-db.patch Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -diff -urN netatalk-2.0.3.orig/bin/cnid/cnid_index.c netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3.orig/bin/cnid/cnid_index.c 2005-04-10 12:49:18.000000000 +0000 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-08-11 17:01:38.000000000 +0000 -@@ -1,5 +1,5 @@ - /* -- * $Id: cnid_index.c,v 1.1.2.4 2005/04/10 12:49:18 didg Exp $ -+ * $Id: cnid_index.c,v 1.1.2.5 2005/09/13 16:57:44 didg Exp $ - * - * All Rights Reserved. See COPYING. - */ -@@ -274,7 +274,11 @@ - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -+#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); -+#endif - - if (ret) { - LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -diff -urN netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c 2004-12-21 13:36:12.000000000 +0000 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-08-11 17:10:19.000000000 +0000 -@@ -1,5 +1,5 @@ - /* -- * $Id: dbif.c,v 1.1.4.15.2.1 2004/12/21 13:36:12 didg Exp $ -+ * $Id: dbif.c,v 1.1.4.15.2.2 2005/09/13 16:57:45 didg Exp $ - * - * Copyright (C) Joerg Lenneis 2003 - * All Rights Reserved. See COPYING. -@@ -514,7 +514,11 @@ - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -+#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); -+#endif - - if (ret) { - LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -diff -urN netatalk-2.0.3.orig/macros/db3-check.m4 netatalk-2.0.3/macros/db3-check.m4 ---- netatalk-2.0.3.orig/macros/db3-check.m4 2004-08-11 03:01:11.000000000 +0000 -+++ netatalk-2.0.3/macros/db3-check.m4 2007-08-11 16:57:02.000000000 +0000 -@@ -1,4 +1,4 @@ --dnl $Id: db3-check.m4,v 1.11.6.9 2004/08/11 03:01:11 bfernhomberg Exp $ -+dnl $Id: db3-check.m4,v 1.11.6.9.2.2 2006/09/09 01:36:39 didg Exp $ - dnl Autoconf macros to check for the Berkeley DB library - - -@@ -111,7 +111,12 @@ - CFLAGS="$savedcflags" - ]) - -- -+dnl I don't understand this stuff below -+dnl AFAIK it works for 4.1 and 4.2 and (4.3 xor 4.4) -+dnl you can have 4.2 and 4.3 installed -+dnl but If you have 4.3 and 4.4 it won't work with 4.3 -+dnl only 4.4 -+dnl didier - AC_DEFUN([NETATALK_BERKELEY_LINK], - [ - atalk_cv_lib_db=no -@@ -119,6 +124,17 @@ - NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2]) -+ -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.4]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb44]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-44]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-4]) -+ -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3]) -+ - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41]) -@@ -134,7 +150,7 @@ - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local/include /usr/include" -- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /" -+ search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.4 /db44 /db4.1 /db41 /db4 /" - - dnl required BDB version - DB_MAJOR_REQ=4 diff -r 297964ebacad -r 22ab8eb50d81 openssh-pam/receipt --- a/openssh-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/openssh-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -32,6 +32,6 @@ cp -a $_pkg/usr/share/Ssh.bin $fs/usr/share cp -a $_pkg/usr/sbin $_pkg/usr/bin $fs/usr cp -a $_pkg/etc $fs - cp stuff/openssh $fs/etc/init.d + cp ../$SOURCE/stuff/openssh $fs/etc/init.d } diff -r 297964ebacad -r 22ab8eb50d81 openssh-pam/stuff/openssh --- a/openssh-pam/stuff/openssh Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -#!/bin/sh -# /etc/init.d/openssh : Start, stop and restart OpenSSH server on SliTaz, at -# boot time or with the command line. -# -# To start OpenSSH server at boot time, just put openssh in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=OpenSSH -DESC="OpenSSH server" -DAEMON=/usr/sbin/sshd -OPTIONS=$OPENSSH_OPTIONS -PIDFILE=/var/run/sshd.pid - -case "$1" in - start) - # We need rsa and dsa host key file to start dropbear. - if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then - echo "Generating $NAME rsa key... " - ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N '' - fi - if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then - echo "Generating $NAME dsa key... " - ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N '' - fi - if [ -f $PIDFILE ] ; then - echo "$NAME already running." - exit 1 - fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - ;; - stop) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - status - ;; - restart) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; -esac - -exit 0 diff -r 297964ebacad -r 22ab8eb50d81 pure-ftpd-pam/receipt --- a/pure-ftpd-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/pure-ftpd-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -28,7 +28,7 @@ mkdir -p $fs/usr $fs/etc/init.d cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/sbin $fs/usr - install -g root -o root -m 0755 stuff/pure-ftpd $fs/etc/init.d + install -g root -o root -m 0755 ../$SOURCE/stuff/pure-ftpd $fs/etc/init.d } post_install() diff -r 297964ebacad -r 22ab8eb50d81 pure-ftpd-pam/stuff/pure-ftpd --- a/pure-ftpd-pam/stuff/pure-ftpd Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -#!/bin/sh -# /etc/init.d/pure-ftpd : Start, stop and restart pure-FTPd daemon on SliTaz, at -# boot time or with the command line. -# -# To start pure-FTPd server at boot time, just put pure-ftpd in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=pure-ftpd -DESC="pure-FTPd Server Daemon" -DAEMON=/usr/sbin/$NAME - -PIDFILE=/var/run/$NAME.pid - -# Options: -# -4 IPV4 Only -# -H Don't resolve -# -A Chroot Everyone -# -B Daemonize -OPTIONS="-4 -H -A -B" - -case "$1" in - start) - if [ -f $PIDFILE ] ; then - echo "$NAME already running." - exit 1 - fi - echo -n "Starting $DESC: $NAME... " - $DAEMON $OPTIONS - status - ;; - stop) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $NAME... " - kill `cat $PIDFILE` - status - ;; - restart) - if [ ! -f $PIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $NAME... " - kill `cat $PIDFILE` - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" - echo "" - exit 1 - ;; -esac - -exit 0 diff -r 297964ebacad -r 22ab8eb50d81 samba-pam/receipt --- a/samba-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/samba-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -31,7 +31,7 @@ make DESTDIR=$PWD/../_pkg install || return 1 rm -f ../_pkg/usr/*bin/*.old ln -s libwbclient.so $PWD/../_pkg/usr/lib/libwbclient.so.0 - cp ../../stuff/*.files-list .. + cp ../../../$SOURCE/stuff/*.files-list .. } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -43,7 +43,7 @@ cp -a $_pkg/usr/lib $fs/usr cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/usr/bin $fs/usr - cp -a stuff/etc $fs + cp -a ../$SOURCE/stuff/etc $fs cat $src/*.files-list | while read file; do rm -rf $fs$file done diff -r 297964ebacad -r 22ab8eb50d81 samba-pam/stuff/etc/init.d/samba --- a/samba-pam/stuff/etc/init.d/samba Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -#!/bin/sh -# /etc/init.d/samba : Start, stop and restart Samba server on SliTaz, at -# boot time or with the command line. -# -# To start Samba server at boot time, just put samba in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=Samba -DESC="Samba server" -SMBD=/usr/sbin/smbd -NMBD=/usr/sbin/nmbd -NMBPIDFILE=/var/run/samba/nmbd.pid -SMBPIDFILE=/var/run/samba/smbd.pid - -case "$1" in - start) - if [ -f $SMBPIDFILE ] ; then - echo "$NAME already running." - exit 1 - fi - echo -n "Starting $DESC: $SMBD... " - $SMBD -D - status - echo -n "Starting $DESC: $NMBD... " - $NMBD -D - status - ;; - stop) - if [ ! -f $SMBPIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Stopping $DESC: $SMBD... " - kill `cat $SMBPIDFILE` - status - echo -n "Stopping $DESC: $NMBD... " - kill `cat $NMBPIDFILE` - status - ;; - restart) - if [ ! -f $SMBPIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Restarting $DESC: $SMBD... " - kill `cat $SMBPIDFILE` - sleep 2 - $SMBD -D - status - echo -n "Restarting $DESC: $NMBD... " - kill `cat $NMBPIDFILE` - sleep 2 - $NMBD -D - status - ;; - reload) - if [ ! -f $SMBPIDFILE ] ; then - echo "$NAME is not running." - exit 1 - fi - echo -n "Reloading $DESC: $SMBD... " - kill -HUP `cat $SMBPIDFILE` - status - ;; - *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart!reload]" - echo "" - exit 1 - ;; -esac - -exit 0 diff -r 297964ebacad -r 22ab8eb50d81 samba-pam/stuff/etc/samba/smb.conf --- a/samba-pam/stuff/etc/samba/smb.conf Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[global] -workgroup = SLITAZ -security = SHARE - -[homes] -comment = Home Directories -valid users = %S -read only = No -browseable = No - diff -r 297964ebacad -r 22ab8eb50d81 samba-pam/stuff/smbclient.files-list --- a/samba-pam/stuff/smbclient.files-list Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -/usr/lib/libwbclient.so* -/usr/bin/smbclient -/usr/bin/smbspool -/usr/bin/smbget -/usr/bin/smbtree -/usr/bin/smbcacls -/usr/bin/smbcquotas -/usr/bin/smbtar -/usr/bin/rpcclient diff -r 297964ebacad -r 22ab8eb50d81 sudo-pam/receipt --- a/sudo-pam/receipt Sat Feb 21 21:27:14 2009 +0000 +++ b/sudo-pam/receipt Sat Feb 21 21:46:09 2009 +0000 @@ -38,7 +38,7 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/usr/lib/*.so $fs/usr/lib - cp -a stuff/sudoers $fs/etc + cp -a ../$SOURCE/stuff/sudoers $fs/etc strip -s $fs/usr/bin/* strip -s $fs/usr/sbin/* strip -s $fs/usr/lib/sudo_noexec.so diff -r 297964ebacad -r 22ab8eb50d81 sudo-pam/stuff/sudoers --- a/sudo-pam/stuff/sudoers Sat Feb 21 21:27:14 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -# -# This file MUST be edited with the 'visudo' command as root. -# -# See the man page for details on how to write a sudoers file. -# - -# Host alias specification - -# User alias specification - -# Cmnd alias specification - -# User privilege specification -root ALL=(ALL) ALL -