OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Apr-2005 13:05:58
Branch: HEAD Handle: 2005042812055800
Modified files:
openpkg-src/qpopper qpopper.patch qpopper.spec
Log:
upgrading package: qpopper 4.0.5 -> 4.0.7
Summary:
Revision Changes Path
1.6 +59 -56 openpkg-src/qpopper/qpopper.patch
1.79 +2 -2 openpkg-src/qpopper/qpopper.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/qpopper.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 qpopper.patch
--- openpkg-src/qpopper/qpopper.patch 6 Feb 2005 13:21:46 -0000 1.5
+++ openpkg-src/qpopper/qpopper.patch 28 Apr 2005 11:05:58 -0000 1.6
@@ -1,7 +1,24 @@
+Index: popper/Makefile.in
+--- popper/Makefile.in.orig 2005-04-26 05:14:37 +0200
++++ popper/Makefile.in 2005-04-28 12:41:52 +0200
+@@ -192,11 +192,10 @@
+ popper: ${OBJS} mangler_library common_library
+ ${CC} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
+ -I${common_srcdir} ${common_dir}/libcommon.a \
+- ${LIBS} ${LDFLAGS}
++ ${LDFLAGS} ${LIBS}
+
+ popauth: ${POPAUTHOBJS}
+- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
+- ${common_dir}/libcommon.a
++ ${CC} -o popauth ${POPAUTHOBJS} ${common_dir}/libcommon.a ${LDFLAGS}
${NETWORK_LIBS} ${DBM_LIBS} ${LIBS}
+
+ poppassd: common_library
+ cd ${password_dir} && ${MAKE} all
Index: popper/main.c
---- popper/main.c.orig 2003-01-02 03:39:02.000000000 +0100
-+++ popper/main.c 2003-09-18 22:04:57.000000000 +0200
-@@ -226,12 +226,6 @@
+--- popper/main.c.orig 2005-04-26 05:14:37 +0200
++++ popper/main.c 2005-04-28 12:41:52 +0200
+@@ -277,12 +277,6 @@
err_out = msg_out = fopen ( "/dev/null", "w+" ); /* until we get set
up */
/*
@@ -14,10 +31,11 @@
* Set defaults for Qargc and Qargv
*/
Qargc = argc;
-@@ -256,43 +250,34 @@
+@@ -307,46 +301,35 @@
ptr = argv [ 1 ];
if ( argc >= 2 && ( *ptr == ':' || isdigit ( (int) *ptr ) ) )
{
+- int j = 0;
- unsigned long a = addr;
- unsigned short n = port;
- char b [ 25 ] = "";
@@ -36,53 +54,55 @@
- ptr = strchr ( ptr, ':' );
- if ( ptr != NULL )
- ptr++;
-+ char *cpIp = NULL;
-+ char *cpPort = NULL;
-+ char *cpDup;
-+ char *cp;
-+
-+ if ((cpDup = strdup(ptr)) == NULL)
-+ err_dump ( HERE, "unable to allocate memory to examine first
argument" );
-+ if ((cp = strchr(cpDup, ':')) != NULL) {
-+ *cp++ = '\0'; /* a colon means both ip and port are given,
split them */
-+ if (*cpDup != '\0') /* do not accept empty strings */
-+ cpIp = cpDup;
-+ if (*cp != '\0') /* do not accept empty strings */
-+ cpPort = cp;
++ char *cpIp = NULL;
++ char *cpPort = NULL;
++ char *cpDup;
++ char *cp;
++
++ if ((cpDup = strdup(ptr)) == NULL)
++ err_dump ( HERE, "unable to allocate memory to examine first
argument" );
++ if ((cp = strchr(cpDup, ':')) != NULL) {
++ *cp++ = '\0'; /* a colon means both ip and port are given,
split them */
++ if (*cpDup != '\0') /* do not accept empty strings */
++ cpIp = cpDup;
++ if (*cp != '\0') /* do not accept empty strings */
++ cpPort = cp;
}
- else
- {
- ptr = argv [ 1 ];
- if ( *ptr == ':' )
- ptr++;
-+ else {
-+ if (strchr (ptr, '.') != NULL)
-+ cpIp = cpDup; /* no colon but a dot means a ip is given */
-+ else
-+ cpPort = cpDup; /* no colon and no dot means a port is
given */
++ else {
++ if (strchr (ptr, '.') != NULL)
++ cpIp = cpDup; /* no colon but a dot means a ip is given
*/
++ else
++ cpPort = cpDup; /* no colon and no dot means a port is
given */
}
-+ if (cpIp != NULL )
-+ addr = inet_addr(cpIp);
-+ if (cpPort != NULL )
-+ port = atoi(cpPort);
-+ free(cpDup);
++ if (cpIp != NULL )
++ addr = inet_addr(cpIp);
++ if (cpPort != NULL )
++ port = atoi(cpPort);
++ free(cpDup);
- /*
- * We might have a port number
- */
- if ( ptr != NULL )
-- n = atoi ( ptr );
+- j = atoi ( ptr );
-
-- if ( a == BAD_ADDR || n == 0 || n > USHRT_MAX )
+- if ( a == BAD_ADDR || j == 0 || j > USHRT_MAX )
+ if ( addr == BAD_ADDR || port == 0 || port > USHRT_MAX )
err_dump ( HERE, "invalid address and/or port: \"%s\"", argv[1]
);
--
+- n = j;
+
- port = htons ( n );
- addr = a;
-
+-
/*
* Since we consumed the first specified parameter,
-@@ -310,6 +295,8 @@
+ * create our own argv that omits it, to pass on to
+@@ -363,6 +346,8 @@
Qargv [ rslt - 1 ] = argv [ rslt ];
Qargc = argc - 1;
}
@@ -91,7 +111,7 @@
/*
* Open the log
-@@ -477,6 +464,22 @@
+@@ -559,6 +544,22 @@
#endif /* not _DEBUG */
@@ -114,7 +134,7 @@
/*
* Set up the socket on which we listen
*/
-@@ -510,17 +513,9 @@
+@@ -596,17 +597,9 @@
rslt = bind ( sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)
);
if ( rslt < 0 )
{
@@ -135,10 +155,10 @@
}
TRACE ( trace_file, POP_DEBUG, HERE,
-Index: pop_dropcopy.c
---- popper/pop_dropcopy.c.orig 2003-01-02 03:39:02.000000000 +0100
-+++ popper/pop_dropcopy.c 2003-10-01 17:33:31.000000000 +0200
-@@ -1231,6 +1231,10 @@
+Index: popper/pop_dropcopy.c
+--- popper/pop_dropcopy.c.orig 2005-04-26 05:14:39 +0200
++++ popper/pop_dropcopy.c 2005-04-28 12:41:52 +0200
+@@ -1232,6 +1232,10 @@
return pop_msg ( p, POP_FAILURE, HERE,
"[SYS/TEMP] Unable to get temp drop name" );
@@ -149,7 +169,7 @@
if ( stat ( p->temp_drop, &mybuf ) == -1 || mybuf.st_size <= 0 ) {
if ( genpath ( p,
p->temp_drop,
-@@ -1239,6 +1243,7 @@
+@@ -1240,6 +1244,7 @@
return pop_msg ( p, POP_FAILURE, HERE,
"[SYS/TEMP] Unable to get temp drop name"
);
}
@@ -157,20 +177,3 @@
}
else {
/*
-Index: popper/Makefile.in
---- popper/Makefile.in.orig 2003-03-13 03:06:36 +0100
-+++ popper/Makefile.in 2005-02-06 14:19:48 +0100
-@@ -185,11 +185,10 @@
- popper: ${OBJS} mangler_library common_library
- ${CC} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
- -I${common_srcdir} ${common_dir}/libcommon.a \
-- ${LIBS} ${LDFLAGS}
-+ ${LDFLAGS} ${LIBS}
-
- popauth: ${POPAUTHOBJS}
-- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
-- ${common_dir}/libcommon.a
-+ ${CC} -o popauth ${POPAUTHOBJS} ${common_dir}/libcommon.a ${LDFLAGS}
${NETWORK_LIBS} ${DBM_LIBS} ${LIBS}
-
- poppassd: common_library
- cd ${password_dir} && ${MAKE} all
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/qpopper.spec
============================================================================
$ cvs diff -u -r1.78 -r1.79 qpopper.spec
--- openpkg-src/qpopper/qpopper.spec 24 Mar 2005 11:20:08 -0000 1.78
+++ openpkg-src/qpopper/qpopper.spec 28 Apr 2005 11:05:58 -0000 1.79
@@ -32,8 +32,8 @@
Class: BASE
Group: Mail
License: GPL
-Version: 4.0.5
-Release: 20050314
+Version: 4.0.7
+Release: 20050428
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
