[arch-commits] Commit in ppp/trunk (PKGBUILD closelog-fix.patch)

Thomas Bächler thomas at archlinux.org
Sun Jan 31 13:12:49 UTC 2010


    Date: Sunday, January 31, 2010 @ 08:12:49
  Author: thomas
Revision: 66522

Upstream update

Modified:
  ppp/trunk/PKGBUILD
Deleted:
  ppp/trunk/closelog-fix.patch

--------------------+
 PKGBUILD           |   10 +++-------
 closelog-fix.patch |   33 ---------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-31 13:11:12 UTC (rev 66521)
+++ PKGBUILD	2010-01-31 13:12:49 UTC (rev 66522)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=ppp
-pkgver=2.4.4
-pkgrel=9
+pkgver=2.4.5
+pkgrel=1
 pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
 arch=(i686 x86_64) 
 url="http://www.samba.org/ppp/"
@@ -19,10 +19,9 @@
         pon.1
         ip-up
         ip-down
-        closelog-fix.patch
         ip-up.d.dns.sh
         ip-down.d.dns.sh)
-md5sums=('183800762e266132218b204dfb428d29'
+md5sums=('4621bc56167b6953ec4071043fe0ec57'
          '7a9259a8f038073eeea7e4552ff1849f'
          '48c024f73a80c8b69c4def22f86902cc'
          '2d811f8470ccdea3b8c4505a438483e9'
@@ -31,7 +30,6 @@
          '44cc662ba9aa61dd9add3ddd4c5ded57'
          'e4beb16ed600b61336d50b2bd2df7cd5'
          '2fa0671f40711e69194ccf60979f8b33'
-         '6f20c1f20ea332767669552bf3c3f7c8'
          '4a074d74c29625b254a1db720cb87b99'
          '8d1be5af8e46393ba6eb273377831e38')
 
@@ -52,8 +50,6 @@
   sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
   # Enable Microsoft proprietary Callback Control Protocol
   sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux 
-  # Fix #8757
-  patch -Np1 -i ${srcdir}/closelog-fix.patch || return 1
   
   ./configure --prefix=/usr
   make || return 1

Deleted: closelog-fix.patch
===================================================================
--- closelog-fix.patch	2010-01-31 13:11:12 UTC (rev 66521)
+++ closelog-fix.patch	2010-01-31 13:12:49 UTC (rev 66522)
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /cvsroot/ppp/pppd/main.c,v
-retrieving revision 1.153
-retrieving revision 1.154
-diff -u -r1.153 -r1.154
---- ppp/pppd/main.c	2006/06/04 03:52:50	1.153
-+++ ppp/pppd/main.c	2006/12/19 07:48:19	1.154
-@@ -66,7 +66,7 @@
-  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--#define RCSID	"$Id: main.c,v 1.153 2006/06/04 03:52:50 paulus Exp $"
-+#define RCSID	"$Id: main.c,v 1.154 2006/12/19 07:48:19 paulus Exp $"
- 
- #include <stdio.h>
- #include <ctype.h>
-@@ -1567,6 +1567,8 @@
- 	if (errfd == 0 || errfd == 1)
- 		errfd = dup(errfd);
- 
-+	closelog();
-+
- 	/* dup the in, out, err fds to 0, 1, 2 */
- 	if (infd != 0)
- 		dup2(infd, 0);
-@@ -1575,7 +1577,6 @@
- 	if (errfd != 2)
- 		dup2(errfd, 2);
- 
--	closelog();
- 	if (log_to_fd > 2)
- 		close(log_to_fd);
- 	if (the_channel->close)




More information about the arch-commits mailing list