From b097d1f2ced79fc3a9769161a91c2a263f2a93a5 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Mon, 9 Jan 2006 22:36:07 +0000 Subject: Take maintainership of this package. Remove old version. Change lock directory to /var/lock (#96339). Install executables SUIDed and SGIDed, with uucp:uucp as owner:group (#115689). (Portage version: 2.0.53) --- .../taylor-uucp/files/digest-taylor-uucp-1.06.2 | 1 - .../taylor-uucp/files/digest-taylor-uucp-1.07-r1 | 1 + net-misc/taylor-uucp/files/gentoo-uucp.diff | 120 --------------------- .../files/taylor-uucp-1.07-gentoo.patch | 120 +++++++++++++++++++++ net-misc/taylor-uucp/files/uucp-patch.diff | 50 --------- 5 files changed, 121 insertions(+), 171 deletions(-) delete mode 100644 net-misc/taylor-uucp/files/digest-taylor-uucp-1.06.2 create mode 100644 net-misc/taylor-uucp/files/digest-taylor-uucp-1.07-r1 delete mode 100644 net-misc/taylor-uucp/files/gentoo-uucp.diff create mode 100644 net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch delete mode 100644 net-misc/taylor-uucp/files/uucp-patch.diff (limited to 'net-misc/taylor-uucp/files') diff --git a/net-misc/taylor-uucp/files/digest-taylor-uucp-1.06.2 b/net-misc/taylor-uucp/files/digest-taylor-uucp-1.06.2 deleted file mode 100644 index bb5a860f4c43..000000000000 --- a/net-misc/taylor-uucp/files/digest-taylor-uucp-1.06.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 73af81dbd748292421a22141b25a5365 uucp-1.06.2.tar.gz 1492239 diff --git a/net-misc/taylor-uucp/files/digest-taylor-uucp-1.07-r1 b/net-misc/taylor-uucp/files/digest-taylor-uucp-1.07-r1 new file mode 100644 index 000000000000..123ed4fc88ac --- /dev/null +++ b/net-misc/taylor-uucp/files/digest-taylor-uucp-1.07-r1 @@ -0,0 +1 @@ +MD5 64c54d43787339a7cced48390eb3e1d0 uucp-1.07.tar.gz 1013234 diff --git a/net-misc/taylor-uucp/files/gentoo-uucp.diff b/net-misc/taylor-uucp/files/gentoo-uucp.diff deleted file mode 100644 index bb5ef5a3c54b..000000000000 --- a/net-misc/taylor-uucp/files/gentoo-uucp.diff +++ /dev/null @@ -1,120 +0,0 @@ ---- 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/files/taylor-uucp-1.07-gentoo.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch new file mode 100644 index 000000000000..11904362c51f --- /dev/null +++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-gentoo.patch @@ -0,0 +1,120 @@ +diff -Nru uucp-1.07.orig/Makefile.in uucp-1.07/Makefile.in +--- uucp-1.07.orig/Makefile.in 2003-05-30 04:31:40.000000000 +0300 ++++ uucp-1.07/Makefile.in 2006-01-09 23:38:41.470224750 +0200 +@@ -1017,12 +1017,12 @@ + + install-exec-hook: + for f in uucico uuxqt; do \ +- chown $(OWNER) $(DESTDIR)$(sbindir)/$${f}; \ +- chmod 4555 $(DESTDIR)$(sbindir)/$${f}; \ ++ chown $(OWNER):uucp $(DESTDIR)$(sbindir)/$${f}; \ ++ chmod 6555 $(DESTDIR)$(sbindir)/$${f}; \ + done + for f in uux uucp uustat uuname cu; do \ +- chown $(OWNER) $(DESTDIR)$(bindir)/$${f}; \ +- chmod 4555 $(DESTDIR)$(bindir)/$${f}; \ ++ chown $(OWNER):uucp $(DESTDIR)$(bindir)/$${f}; \ ++ chmod 6555 $(DESTDIR)$(bindir)/$${f}; \ + done + @HAVE_MKDIR_FALSE@ chown $(OWNER) $(DESTDIR)$(uudirdir) + @HAVE_MKDIR_FALSE@ chmod 100 $(DESTDIR)$(uudirdir) +diff -Nru uucp-1.07.orig/policy.h uucp-1.07/policy.h +--- uucp-1.07.orig/policy.h 2003-05-29 09:08:45.000000000 +0300 ++++ uucp-1.07/policy.h 2006-01-09 23:42:14.667548750 +0200 +@@ -302,8 +302,7 @@ + /* #define LOCKDIR "/usr/spool/locks" */ + /* #define LOCKDIR "/usr/spool/uucp/LCK" */ + /* #define LOCKDIR "/var/spool/lock" */ +-/* #define LOCKDIR "/var/lock" */ +- ++#define LOCKDIR "/var/lock" + /* You must also specify the format of the lock files by setting + exactly one of the following macros to 1. Check an existing lock + file to decide which of these choices is more appropriate. +@@ -572,16 +571,14 @@ + /* 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 +@@ -644,23 +641,17 @@ + /* 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 */ + +@@ -669,17 +660,17 @@ + /* 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" + + /* 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" + + /* 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 */ + +@@ -692,16 +683,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/files/uucp-patch.diff b/net-misc/taylor-uucp/files/uucp-patch.diff deleted file mode 100644 index 134163a65f48..000000000000 --- a/net-misc/taylor-uucp/files/uucp-patch.diff +++ /dev/null @@ -1,50 +0,0 @@ -*** uucp-1.06.AL/configure Sun Dec 22 21:38:24 2002 ---- uucp-1.06.1/configure Mon Aug 21 07:32:04 1995 -*************** -*** 163,207 **** - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - -- -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -- ac_prev=mandir ;; -- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -- mandir=$ac_optarg ;; -- -- -infodir | --infodir | --infodi | --infod | --info | --inf) -- ac_prev=infodir ;; -- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -- infodir=$ac_optarg ;; -- -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -- ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -- datadir=$ac_optarg ;; -- -- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -- | --syscon | --sysco | --sysc | --sys | --sy) -- ac_prev=sysconfdir ;; -- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -- sysconfdir=$ac_optarg ;; -- -- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -- | --libexe | --libex | --libe) -- ac_prev=libexecdir ;; -- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -- | --libexe=* | --libex=* | --libe=*) -- libexecdir=$ac_optarg ;; -- -- -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -- ac_prev=localstatedir ;; -- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -- localstatedir=$ac_optarg ;; -- - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; ---- 163,168 ---- -- cgit v1.2.3-65-gdbad