summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/taylor-uucp')
-rw-r--r--net-misc/taylor-uucp/ChangeLog6
-rw-r--r--net-misc/taylor-uucp/files/gentoo-uucp.diff120
-rw-r--r--net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild21
3 files changed, 135 insertions, 12 deletions
diff --git a/net-misc/taylor-uucp/ChangeLog b/net-misc/taylor-uucp/ChangeLog
index 60a23928bddb..51cba97fd108 100644
--- a/net-misc/taylor-uucp/ChangeLog
+++ b/net-misc/taylor-uucp/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for net-misc/taylor-uucp
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.6 2003/02/12 08:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.7 2003/07/31 19:19:39 rphillips Exp $
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
*taylor-uucp-1.06.2 (21 Jun 2002)
+ 31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> :
+ Added Chuck Short's patches. Bug #19128.
+ Spooled data in stored in /var/spool and logging in /var/log
+
27 Dec 2002; Ryan Phillips <rphillips@gentoo.org> :
Added Arnim Littek's patch to the ebuild. Fixes a configuration problem
diff --git a/net-misc/taylor-uucp/files/gentoo-uucp.diff b/net-misc/taylor-uucp/files/gentoo-uucp.diff
new file mode 100644
index 000000000000..bb5ef5a3c54b
--- /dev/null
+++ b/net-misc/taylor-uucp/files/gentoo-uucp.diff
@@ -0,0 +1,120 @@
+--- uucp-1.06.1/policy.h 1995-08-20 19:36:06.000000000 +0000
++++ uucp-1.06.1.old/policy.h 2003-04-12 07:33:43.000000000 +0000
+@@ -295,13 +295,14 @@
+ these lock files will be placed in the named directory; otherwise
+ they will be placed in the default spool directory. On some HDB
+ systems the lock files are placed in /etc/locks. On some they are
+- placed in /usr/spool/locks. On the NeXT they are placed in
+- /usr/spool/uucp/LCK. */
+-/* #define LOCKDIR "/usr/spool/uucp" */
++ placed in /var/spool/locks. On the NeXT they are placed in
++ /var/spool/uucp/LCK. */
++/* #define LOCKDIR "/var/spool/uucp" */
+ /* #define LOCKDIR "/etc/locks" */
+-/* #define LOCKDIR "/usr/spool/locks" */
+-/* #define LOCKDIR "/usr/spool/uucp/LCK" */
++/* #define LOCKDIR "/var/spool/locks" */
++/* #define LOCKDIR "/var/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
++# define LOCKDIR "/var/lock/subsys"
+
+ /* You must also specify the format of the lock files by setting
+ exactly one of the following macros to 1. Check an existing lock
+@@ -522,7 +523,7 @@
+
+ If you define HAVE_HDB_LOGGING, each program will by default use a
+ separate log file. For uucico talking to uunet, for example, it
+- will be /usr/spool/uucp/.Log/uucico/uunet. Each line will look
++ will be /var/spool/uucp/.Log/uucico/uunet. Each line will look
+ something like this:
+
+ uucp uunet (12/10-09:04:22,16390,1) Receiving uunet/D./D.uunetSwJ72
+@@ -571,16 +572,16 @@
+ /* The name of the default spool directory. If HAVE_TAYLOR_CONFIG is
+ set to 1, this may be overridden by the ``spool'' command in the
+ configuration file. */
+-#define SPOOLDIR "/usr/spool/uucp"
+ /* #define SPOOLDIR "/var/spool/uucp" */
++ #define SPOOLDIR "/var/spool/uucp"
+
+ /* The name of the default public directory. If HAVE_TAYLOR_CONFIG is
+ set to 1, this may be overridden by the ``pubdir'' command in the
+ configuration file. Also, a particular system may be given a
+ specific public directory by using the ``pubdir'' command in the
+ system file. */
+-#define PUBDIR "/usr/spool/uucppublic"
+ /* #define PUBDIR "/var/spool/uucppublic" */
++ #define PUBDIR "/var/spool/uucppublic"
+
+ /* The default command path. This is a space separated list of
+ directories. Remote command executions requested by uux are looked
+@@ -643,20 +644,20 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+ command in the configuration file. */
+-#define LOGFILE "/usr/spool/uucp/Log"
+-/* #define LOGFILE "/var/spool/uucp/Log" */
++/*#define LOGFILE "/var/log/uucp/Log" */
++ #define LOGFILE "/var/log/uucp/Log"
+
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING. When
+ using HAVE_TAYLOR_CONFIG, this may be overridden by the
+ ``statfile'' command in the configuration file. */
+-#define STATFILE "/usr/spool/uucp/Stats"
+-/* #define STATFILE "/var/spool/uucp/Stats" */
++/*#define STATFILE "/var/log/uucp/Stats" */
++ #define STATFILE "/var/log/uucp/Stats"
+
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING. When
+ using HAVE_TAYLOR_CONFIG, this may be overridden by the
+ ``debugfile'' command in the configuration file. */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
+-/* #define DEBUGFILE "/var/spool/uucp/Debug" */
++/*#define DEBUGFILE "/var/log/uucp/Debug" */
++#define DEBUGFILE "/var/log/uucp/Debug"
+
+ #endif /* HAVE_TAYLOR_LOGGING */
+
+@@ -665,17 +666,19 @@
+ /* The default log file when using HAVE_V2_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+ command in the configuration file. */
+-#define LOGFILE "/usr/spool/uucp/LOGFILE"
++/*#define LOGFILE "/var/log/uucp/LOGFILE" */
++#define LOGFILE "/var/log/uucp/LOGFILE"
+
+ /* The default statistics file when using HAVE_V2_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+ command in the configuration file. */
+-#define STATFILE "/usr/spool/uucp/SYSLOG"
++/* #define STATFILE "/var/log/uucp/SYSLOG" */
++#define STATFILE "/var/log/uucp/SYSLOG"
+
+ /* The default debugging file when using HAVE_V2_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+ command in the configuration file. */
+-#define DEBUGFILE "/usr/spool/uucp/DEBUG"
++#define DEBUGFILE "/var/log/uucp/DEBUG"
+
+ #endif /* HAVE_V2_LOGGING */
+
+@@ -688,16 +691,16 @@
+ be replaced by the system name (if there is no appropriate system,
+ "ANY" will be used). No other '%' character may appear in the
+ string. */
+-#define LOGFILE "/usr/spool/uucp/.Log/%s/%s"
++#define LOGFILE "/var/log/uucp/.Log/%s/%s"
+
+ /* The default statistics file when using HAVE_HDB_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+ command in the configuration file. */
+-#define STATFILE "/usr/spool/uucp/.Admin/xferstats"
++#define STATFILE "/var/log/uucp/.Admin/xferstats"
+
+ /* The default debugging file when using HAVE_HDB_LOGGING. When using
+ HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+ command in the configuration file. */
+-#define DEBUGFILE "/usr/spool/uucp/.Admin/audit.local"
++#define DEBUGFILE "/var/log/uucp/.Admin/audit.local"
+
+ #endif /* HAVE_HDB_LOGGING */
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
index f2afc636aa30..48bc6eaf673f 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild,v 1.9 2003/02/13 15:08:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild,v 1.10 2003/07/31 19:19:39 rphillips Exp $
S=${WORKDIR}/uucp-1.06.1 # This should be a .2 bug the package is messed
DESCRIPTION="Taylor UUCP"
@@ -14,17 +14,10 @@ SLOT="0"
DEPEND="virtual/glibc"
src_compile() {
- patch -R -p1 < ${FILESDIR}/uucp-patch.diff
+ epatch ${FILESDIR}/gentoo-uucp.diff
- econf
- make \
- sbindir=/usr/sbin \
- bindir=/usr/bin \
- man1dir=/usr/share/man/man1 \
- man8dir=/usr/share/man/man8 \
- newconfigdir=/etc/uucp \
- infodir=/usr/share/info \
- || die
+ sh configure
+ make || die
}
src_install() {
@@ -43,5 +36,11 @@ src_install() {
newconfigdir=${D}/etc/uucp \
infodir=${D}/usr/share/info \
install install-info || die
+ cp sample/* ${D}/etc/uucp
dodoc COPYING ChangeLog MANIFEST NEWS README TODO
}
+
+pkg_preinst()
+{
+ usermod -s /bin/bash uucp
+}