OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 04-Jun-2003 11:45:05
Branch: HEAD Handle: 2003060410445905
Modified files:
openpkg-re/vcheck vc.uucp
openpkg-src/uucp uucp.patch uucp.spec
openpkg-web news.txt
Log:
upgrading package: uucp 1.06.1 -> 1.07
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-re/vcheck/vc.uucp
1.3 +11 -349 openpkg-src/uucp/uucp.patch
1.28 +15 -13 openpkg-src/uucp/uucp.spec
1.4723 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.uucp
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.uucp
--- openpkg-re/vcheck/vc.uucp 14 Mar 2002 10:16:47 -0000 1.1
+++ openpkg-re/vcheck/vc.uucp 4 Jun 2003 09:44:59 -0000 1.2
@@ -2,7 +2,7 @@
}
prog uucp = {
- version = 1.06.2
+ version = 1.07
url = ftp://ftp.gnu.org/gnu/uucp/
regex = uucp-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 uucp.patch
--- openpkg-src/uucp/uucp.patch 16 Aug 2002 18:51:50 -0000 1.2
+++ openpkg-src/uucp/uucp.patch 4 Jun 2003 09:45:03 -0000 1.3
@@ -1,349 +1,11 @@
---- uucp-1.06.1.orig/contrib/uurate.c
-+++ uucp-1.06.1/contrib/uurate.c
-@@ -302,6 +307,7 @@
- int sent, called = IN;
- int report = 0; /* if <= 0 give msg that no report was avail. */
- int junk;
-+ extern int getopt();
-
- /* --------------------------------------------------------------------
- * P r o l o g
-@@ -980,7 +986,7 @@
- if (cur->next == NULL) /* totals line reached ? */
- hdrprt('s',1); /* print the separator line */
-
-- printf("%-8s %4d %4d %9s %9s %9s %9s %9s %5.0f %5.0f\n",
-+ printf("%-8s %4ld %4ld %9s %9s %9s %8s %8s %5.0f %5.0f\n",
- cur->Hostname, rf, sf,
- t1, t2, t3, t4, t5,
- ir, or);
-@@ -1028,7 +1034,7 @@
- hdrprt('p',0); /* print the header line(s) */
- hdr_done = TRUE;
- }
-- printf("%-8s %3s %4d %4d %5d %4d %10d %7d %10d\n",
-+ printf("%-8s %3s %4ld %4ld %5ld %4ld %10ld %7ld %10ld\n",
- type == NULL ? " ":cur->Hostname,
- prot->type,
- prot->pr_psizemin,
-@@ -1072,7 +1078,7 @@
- hdrprt('p',1); /* print the header line(s) */
- hdr_done = TRUE;
- }
-- printf("%-8s %3s %11d %11d %11d %11d\n",
-+ printf("%-8s %3s %11ld %11ld %11ld %11ld\n",
- type == NULL ? " ":cur->Hostname,
- prot->type,
- prot->pr_eheader,
-@@ -1747,13 +1753,13 @@
- puts("\nCompact summary:");
- puts("----------------");
- puts("\
--Name of + Files + +------- Bytes/1000 --------+ +------ Time -----+ + Avg CPS +\n\
--site in out inbound outbound total inbound outbound in out\n\
---------- ---- ---- --------- --------- --------- --------- --------- ----- -----");
-+Name of + Files + +------- Bytes/1000 --------+ +----- Time ----+ + Avg CPS +\n\
-+site in out inbound outbound total inbound outbound in out\n\
-+-------- ---- ---- --------- --------- --------- -------- -------- ----- -----");
- }
- else
- puts("\
----------------------------------------------------------------------------------");
-+------------------------------------------------------------------------------");
- break;
-
-
---- uucp-1.06.1.orig/system.h
-+++ uucp-1.06.1/system.h
-@@ -303,7 +303,8 @@
- will allow all grades from 'A' to 'Z' and 'a' to 'd'). This
- function should return FALSE on error. */
- extern boolean fsysdep_get_work_init P((const struct uuconf_system *qsys,
-- int bgrade));
-+ int bgrade,
-+ boolean unlimited));
-
- /* Get the next command to be executed for a remote system. The
- bgrade argument will be the same as for fsysdep_get_work_init;
---- uucp-1.06.1.orig/trans.c
-+++ uucp-1.06.1/trans.c
-@@ -511,7 +511,7 @@
- if (bgrade == '\0')
- return TRUE;
-
-- if (! fsysdep_get_work_init (qsys, bgrade))
-+ if (! fsysdep_get_work_init (qsys, bgrade, FALSE))
- return FALSE;
-
- while (TRUE)
-@@ -670,7 +670,8 @@
- fhangup = FALSE;
-
- if (qdaemon->fhangup_requested
-- && qTsend == NULL)
-+ && qTsend == NULL
-+ && (qTreceive == NULL || qdaemon->cchans > 1))
- {
- /* The remote system has requested that we transfer
- control by sending CYM after receiving a file. */
---- uucp-1.06.1.orig/uucico.c
-+++ uucp-1.06.1/uucico.c
-@@ -126,6 +126,9 @@
- struct sconnection *qconn;
- };
-
-+/* min. grade set on commandline */
-+static char cmdlgrade = '\0';
-+
- /* Local functions. */
-
- static void uusage P((void));
-@@ -176,6 +179,7 @@
- { "nodetach", no_argument, NULL, 'D' },
- { "loop", no_argument, NULL, 'e' },
- { "force", no_argument, NULL, 'f'},
-+ { "grade", required_argument, NULL, 'g'},
- { "stdin", required_argument, NULL, 'i' },
- { "prompt", no_argument, NULL, 'l' },
- { "port", required_argument, NULL, 'p' },
-@@ -250,9 +254,9 @@
- ++zProgram;
-
- #if COHERENT_C_OPTION
-- zopts = "c:CDefi:I:lp:qr:s:S:u:x:X:vwz";
-+ zopts = "c:CDefg:i:I:lp:qr:s:S:u:x:X:vwz";
- #else
-- zopts = "cCDefi:I:lp:qr:s:S:u:x:X:vwz";
-+ zopts = "cCDefg:i:I:lp:qr:s:S:u:x:X:vwz";
- #endif
-
- while ((iopt = getopt_long (argc, argv, zopts,
-@@ -293,6 +297,14 @@
- failed call. */
- fforce = TRUE;
- break;
-+
-+ case 'g':
-+ /* Force a grade */
-+ if (isalpha(optarg[0]))
-+ cmdlgrade = optarg[0];
-+ else
-+ fprintf (stderr, "%s: invalid grade \n", zProgram);
-+ break;
-
- case 'i':
- /* Type of port to use for standard input. Only TLI is
-@@ -794,6 +806,7 @@
- printf ("Usage: %s [options]\n", zProgram);
- printf (" -s,-S,--system system: Call system (-S implies -f)\n");
- printf (" -f,--force: Force call despite system status\n");
-+ printf (" -g,--grade: limit outgoing call to a given grade\n");
- printf (" -r state: 1 for master, 0 for slave (default)\n");
- printf (" --master: Act as master\n");
- printf (" --slave: Act as slave (default)\n");
-@@ -940,6 +953,9 @@
- if (! qsys->uuconf_fcall || qsys->uuconf_qtimegrade == NULL)
- continue;
-
-+ if (qport && strcmp (qsys->uuconf_zport,qport->uuconf_zname))
-+ continue;
-+
- fnevertime = FALSE;
-
- /* Make sure this is a legal time to call. */
-@@ -1331,12 +1347,18 @@
- boolean fret;
-
- /* Determine the grade we should request of the other system. A
-- '\0' means that no restrictions have been made. */
-- if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
-- (int *) NULL))
-- bgrade = '\0';
-+ '\0' means that no restrictions have been made.
-+ If a grade is set on the command line, the calltimegrade-value
-+ is overwritten. */
-+
-+ if (cmdlgrade != '\0')
-+ bgrade = cmdlgrade;
- else
-- bgrade = (char) ival;
-+ if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
-+ (int *) NULL))
-+ bgrade = '\0';
-+ else
-+ bgrade = (char) ival;
-
- /* Determine the name we will call ourselves. */
- if (qsys->uuconf_zlocalname != NULL)
---- uucp-1.06.1.orig/uustat.c
-+++ uucp-1.06.1/uustat.c
-@@ -933,7 +933,7 @@
- {
- boolean fret;
-
-- if (! fsysdep_get_work_init (qsys, UUCONF_GRADE_LOW))
-+ if (! fsysdep_get_work_init (qsys, UUCONF_GRADE_LOW, TRUE))
- return FALSE;
-
- while (TRUE)
-@@ -2166,7 +2166,7 @@
- char *zid;
- boolean fret;
-
-- if (! fsysdep_get_work_init (qsys, UUCONF_GRADE_LOW))
-+ if (! fsysdep_get_work_init (qsys, UUCONF_GRADE_LOW, TRUE))
- return FALSE;
-
- cwork = 0;
---- uucp-1.06.1.orig/uuxqt.c
-+++ uucp-1.06.1/uuxqt.c
-@@ -928,6 +928,44 @@
- don't permit multiple arguments. */
- for (i = 1; azQargs[i] != NULL; i++)
- {
-+ if (azQargs[i][0] == '-' && azQargs[i][1] == '-')
-+ {
-+ char *zopts = azQargs[i] + 2;
-+
-+ /* The -g, -n, and -s options take an argument. */
-+ if (!strncmp(zopts, "grade", 5) && zopts[5] != '=')
-+ {
-+ if (azQargs[i+1] != NULL)
-+ ++i;
-+ }
-+ if (!(strncmp(zopts, "notify", 6)
-+ && strncmp(zopts, "status", 6)) && zopts[6] != '=')
-+ {
-+ if (azQargs[i+1] != NULL)
-+ ++i;
-+ }
-+
-+ /* The -I, -u and -x options are not permitted. */
-+ if (!strncmp(zopts, "config", 6))
-+ {
-+ if (zopts[6] != '=' && azQargs[i+1] != NULL)
-+ ++i;
-+ azQargs[i] = zbufcpy ("--nouucico");
-+ }
-+ if (!strncmp(zopts, "user", 4))
-+ {
-+ if (zopts[4] != '=' && azQargs[i+1] != NULL)
-+ ++i;
-+ azQargs[i] = zbufcpy ("--nouucico");
-+ }
-+ if (!strncmp(zopts, "debug", 5))
-+ {
-+ if (zopts[5] != '=' && azQargs[i+1] != NULL)
-+ ++i;
-+ azQargs[i] = zbufcpy ("--nouucico");
-+ }
-+ }
-+ else
- if (azQargs[i][0] == '-')
- {
- char *zopts;
---- uucp-1.06.1.orig/unix/lock.c
-+++ uucp-1.06.1/unix/lock.c
-@@ -425,7 +425,9 @@
- {
- (void) close (o);
- o = -1;
-- (void) remove (zpath);
-+ if (remove (zpath) < 0 && errno == EPERM)
-+ break;
-+ sleep(1);
- fret = TRUE;
- continue;
- }
---- uucp-1.06.1.orig/unix/serial.c
-+++ uucp-1.06.1/unix/serial.c
-@@ -920,6 +920,12 @@
- #ifdef B115200
- { B115200, 115200 },
- #endif
-+#ifdef B230400
-+ { B230400, 230400 },
-+#endif
-+#ifdef B460800
-+ { B460800, 460800 },
-+#endif
- { B0, 0 }
- };
-
-@@ -2371,8 +2377,17 @@
- else
- csleepchars = MAX_INPUT - 10;
-
-+#ifndef BUG
-+ if (q->ibaud) {
-+ isleep = (int) (((long) csleepchars * 10000L) / q->ibaud);
-+ isleep -= 10;
-+ } else {
-+ isleep = 1000; /* I hope, a second is right... */
-+ }
-+#else
- isleep = (int) (((long) csleepchars * 10000L) / q->ibaud);
- isleep -= 10;
-+#endif
-
- if (isleep > 10)
- {
-@@ -2773,9 +2788,20 @@
- / baud bits/sec)
- * 10 bits/byte)
- */
-+#ifndef BUG
-+ if (q->ibaud) {
-+ stime.tv_sec = (long) 10240 / q->ibaud;
-+ stime.tv_usec = ((((long) 1024000000 / q->ibaud) * (long) 10)
-+ % (long) 1000000);
-+ } else {
-+ stime.tv_sec = 1;
-+ stime.tv_usec = 0;
-+ }
-+#else
- stime.tv_sec = (long) 10240 / q->ibaud;
- stime.tv_usec = ((((long) 1024000000 / q->ibaud) * (long) 10)
- % (long) 1000000);
-+#endif
-
- imask = 1 << q->o;
- if (imask == 0)
-@@ -2846,7 +2872,14 @@
- we don't need to use the catch stuff, since we know
- that HAVE_RESTARTABLE_SYSCALLS is 0. */
- usset_signal (SIGALRM, usalarm, TRUE, (boolean *) NULL);
-+#ifndef BUG
-+ if (q->ibaud)
-+ alarm ((int) ((long) 10240 / q->ibaud) + 1);
-+ else
-+ alarm (1);
-+#else
- alarm ((int) ((long) 10240 / q->ibaud) + 1);
-+#endif
-
- /* There is a race condition here: on a severely loaded
- system, we could get the alarm before we start the
---- uucp-1.06.1.orig/unix/work.c
-+++ uucp-1.06.1/unix/work.c
-@@ -282,9 +282,10 @@
- #define CWORKFILES (10)
-
- boolean
--fsysdep_get_work_init (qsys, bgrade)
-+fsysdep_get_work_init (qsys, bgrade, unlimited)
- const struct uuconf_system *qsys;
- int bgrade;
-+ boolean unlimited;
- {
- char *zdir;
- DIR *qdir;
-@@ -398,7 +399,7 @@
- asSwork_files[cSwork_files].zfile = zname;
- asSwork_files[cSwork_files].bgrade = bfilegrade;
- ++cSwork_files;
-- if (cSwork_files - chad > COMMANDS_PER_SCAN)
-+ if (!unlimited && (cSwork_files - chad > COMMANDS_PER_SCAN))
- break;
- }
- }
+--- unix/Makefile.in.orig Fri May 30 03:31:50 2003
++++ unix/Makefile.in Wed Jun 4 10:36:20 2003
+@@ -111,7 +111,7 @@
+ LIBRARIES = $(noinst_LIBRARIES)
+
+ libunix_a_AR = $(AR) cru
+-libunix_a_DEPENDENCIES =
++libunix_a_DEPENDENCIES = $(libunix_a_LIBADD)
+ am_libunix_a_OBJECTS = access.$(OBJEXT) addbas.$(OBJEXT) app3.$(OBJEXT) \
+ app4.$(OBJEXT) basnam.$(OBJEXT) bytfre.$(OBJEXT) \
+ corrup.$(OBJEXT) chmod.$(OBJEXT) cohtty.$(OBJEXT) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 uucp.spec
--- openpkg-src/uucp/uucp.spec 9 Apr 2003 14:06:53 -0000 1.27
+++ openpkg-src/uucp/uucp.spec 4 Jun 2003 09:45:04 -0000 1.28
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: Communication
License: GPL
-Version: 1.06.1
-Release: 20030409
+Version: 1.07
+Release: 20030604
# list of sources
Source0: ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ -57,22 +57,26 @@
%prep
%setup0 -q -c -n uucp-%{version}
- %patch0 -p0
%setup1 -q -T -D -a 1
%setup2 -q -T -D -a 2
-
-%build
( cd uucp-%{version}
+ %patch0 -p0
%{l_shtool} subst \
-e 's;chown;true;g' \
- -e 's;owner = uucp;owner = %{l_musr};' \
- -e 's;\(sbindir = $(exec_prefix)\)/lib/uucp;\1/sbin;' \
- -e 's;/conf/uucp;/etc/uucp;' \
- Makefile.in
+ -e 's;chgrp;true;g' \
+ `find . -name Makefile.in -print`
+ )
+
+%build
+ ( cd uucp-%{version}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --with-newconfigdir=%{l_prefix}/etc/uucp \
+ --with-oldconfigdir=%{l_prefix}/etc/uucp \
+ --with-user=%{l_musr}
%{l_make} %{l_mflags}
)
( cd uucpd
@@ -96,9 +100,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/uucp/run \
$RPM_BUILD_ROOT%{l_prefix}/var/uucp/log
( cd uucp-%{version}
- %{l_make} %{l_mflags} install install-info \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install install-info
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
)
%{l_shtool} install -c -s -m 755 \
uucpd/uucpd $RPM_BUILD_ROOT%{l_prefix}/sbin/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4722 -r1.4723 news.txt
--- openpkg-web/news.txt 4 Jun 2003 09:36:04 -0000 1.4722
+++ openpkg-web/news.txt 4 Jun 2003 09:45:00 -0000 1.4723
@@ -1,3 +1,4 @@
+04-Jun-2003: Upgraded package: P<uucp-1.07-20030604>
04-Jun-2003: Upgraded package: P<imagemagick-5.5.7.8-20030604>
04-Jun-2003: Upgraded package: P<perforce-2003.1-20030604>
04-Jun-2003: Upgraded package: P<openpkg-20030604-20030604>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
