From e7ed7907d110b205416fa4c605363394fd72f1a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Sun, 15 Apr 2007 10:42:17 +0000 Subject: [PATCH] Fix multilib-strict violation. Package-Manager: portage-2.1.2.2 --- net-dialup/rp-l2tp/ChangeLog | 11 +- net-dialup/rp-l2tp/Manifest | 38 ++--- ...gest-rp-l2tp-0.4 => digest-rp-l2tp-0.4-r1} | 0 ...4-gentoo.diff => rp-l2tp-0.4-gentoo.patch} | 137 ++++++++++-------- ...-l2tp-0.4.ebuild => rp-l2tp-0.4-r1.ebuild} | 8 +- net-dialup/rppppoek/Manifest | 24 +-- 6 files changed, 124 insertions(+), 94 deletions(-) rename net-dialup/rp-l2tp/files/{digest-rp-l2tp-0.4 => digest-rp-l2tp-0.4-r1} (100%) rename net-dialup/rp-l2tp/files/{rp-l2tp-0.4-gentoo.diff => rp-l2tp-0.4-gentoo.patch} (77%) rename net-dialup/rp-l2tp/{rp-l2tp-0.4.ebuild => rp-l2tp-0.4-r1.ebuild} (80%) diff --git a/net-dialup/rp-l2tp/ChangeLog b/net-dialup/rp-l2tp/ChangeLog index be83271d7826..8bc989da6ec2 100644 --- a/net-dialup/rp-l2tp/ChangeLog +++ b/net-dialup/rp-l2tp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/rp-l2tp -# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-l2tp/ChangeLog,v 1.15 2006/09/23 15:04:50 mrness Exp $ +# Copyright 2003-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-l2tp/ChangeLog,v 1.16 2007/04/15 10:42:17 mrness Exp $ + +*rp-l2tp-0.4-r1 (15 Apr 2007) + + 15 Apr 2007; Alin Năstac + -files/rp-l2tp-0.4-gentoo.diff, +files/rp-l2tp-0.4-gentoo.patch, + -rp-l2tp-0.4.ebuild, +rp-l2tp-0.4-r1.ebuild: + Fix multilib-strict violation. 23 Sep 2006; Alin Nastac files/rp-l2tp-0.4-gentoo.diff: diff --git a/net-dialup/rp-l2tp/Manifest b/net-dialup/rp-l2tp/Manifest index 0139fd80b88e..5560821753fe 100644 --- a/net-dialup/rp-l2tp/Manifest +++ b/net-dialup/rp-l2tp/Manifest @@ -1,34 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX rp-l2tp-0.4-gentoo.diff 8850 RMD160 0c635aa83e11b27b82460704efb906c6dcb44ff3 SHA1 63c26eb8d1edea100b8772dcfc48521c9214e93a SHA256 7cea2b8fe65c6d84014e6b9093e2ef34c562be6c7bc9e6db479cb2bdf1811f16 -MD5 3225dd7cc3c3b70c09abb46f9697fb2a files/rp-l2tp-0.4-gentoo.diff 8850 -RMD160 0c635aa83e11b27b82460704efb906c6dcb44ff3 files/rp-l2tp-0.4-gentoo.diff 8850 -SHA256 7cea2b8fe65c6d84014e6b9093e2ef34c562be6c7bc9e6db479cb2bdf1811f16 files/rp-l2tp-0.4-gentoo.diff 8850 +AUX rp-l2tp-0.4-gentoo.patch 9551 RMD160 7fa18df994bfa41d9bd79f65faca6f02cc60e853 SHA1 1f720971cb303082a018a9da0f79e68afffa0a5f SHA256 413eccbefcd0eb7cd8b22edf8c9f1ac098328d5773815f663275f1b160edfd48 +MD5 2be2d4b4ff3e4911965df98d7117ba7e files/rp-l2tp-0.4-gentoo.patch 9551 +RMD160 7fa18df994bfa41d9bd79f65faca6f02cc60e853 files/rp-l2tp-0.4-gentoo.patch 9551 +SHA256 413eccbefcd0eb7cd8b22edf8c9f1ac098328d5773815f663275f1b160edfd48 files/rp-l2tp-0.4-gentoo.patch 9551 AUX rp-l2tpd-init 484 RMD160 8e41b479ca31a9288aa357b87a014c86681cf93b SHA1 003de9ad0797a0ddd337a842e813141d9fe2e980 SHA256 51d33fabbb510b6a3096dcbb79e55e075a666df2fb0190ce40cab3b6d68680db MD5 253968a2351a4312da37ef20131502a5 files/rp-l2tpd-init 484 RMD160 8e41b479ca31a9288aa357b87a014c86681cf93b files/rp-l2tpd-init 484 SHA256 51d33fabbb510b6a3096dcbb79e55e075a666df2fb0190ce40cab3b6d68680db files/rp-l2tpd-init 484 DIST rp-l2tp-0.4.tar.gz 198869 RMD160 353690aff7e07d6ed843e57b88bc2511ee296a0e SHA1 a3c2515acbdde167394a058bc7bc55de1e59fca2 SHA256 1b5bfbd130867e55018a4e64c720c09d821688c81e6e687858948837e137d555 -EBUILD rp-l2tp-0.4.ebuild 801 RMD160 3bf70c9a2e714b7cc9704640cde39a3c2dae68c7 SHA1 fdf20aae8cb47d38813052f5a877aa063e27d09f SHA256 74823b7451c087a66c03a6a908d1f418d62485bea804f8a87c87dcbbef75ba81 -MD5 55372a398f12693d427b04cb2247a120 rp-l2tp-0.4.ebuild 801 -RMD160 3bf70c9a2e714b7cc9704640cde39a3c2dae68c7 rp-l2tp-0.4.ebuild 801 -SHA256 74823b7451c087a66c03a6a908d1f418d62485bea804f8a87c87dcbbef75ba81 rp-l2tp-0.4.ebuild 801 -MISC ChangeLog 2033 RMD160 03f6e4dc03669d016aa27eae214a7cf9dedb425a SHA1 a44b091275ff66c03b7472b0aa0e9bad4a720ad5 SHA256 8722b815adf2abb383a3976d7bd8934717caa93a833eae3156c5fb4a7a6fef8c -MD5 c8655a037b16c55d2d7205e8c591483a ChangeLog 2033 -RMD160 03f6e4dc03669d016aa27eae214a7cf9dedb425a ChangeLog 2033 -SHA256 8722b815adf2abb383a3976d7bd8934717caa93a833eae3156c5fb4a7a6fef8c ChangeLog 2033 +EBUILD rp-l2tp-0.4-r1.ebuild 805 RMD160 3197b3c194d69861d9b90f411b0a77644e2b1109 SHA1 c7aa268f6f712f4fc20baaad974ed5c04f161b9e SHA256 913b5594be421a0f75740a5964fe8819fc43f4eeacc59c4524f057703557b29d +MD5 5e79b171698212a2b97248afcfc45215 rp-l2tp-0.4-r1.ebuild 805 +RMD160 3197b3c194d69861d9b90f411b0a77644e2b1109 rp-l2tp-0.4-r1.ebuild 805 +SHA256 913b5594be421a0f75740a5964fe8819fc43f4eeacc59c4524f057703557b29d rp-l2tp-0.4-r1.ebuild 805 +MISC ChangeLog 2260 RMD160 2e4b776f7d0c5b9e4068e66081861e07c3215a75 SHA1 ac87fe9e7d076622816b6eef9cb7f6522030608f SHA256 2ebd3be5f91d9045df8ba5a1ee83e85d6bd7873fb6add98afbdd32dbd89dac4e +MD5 18f74c88cf23f8245ff815dd91a0917d ChangeLog 2260 +RMD160 2e4b776f7d0c5b9e4068e66081861e07c3215a75 ChangeLog 2260 +SHA256 2ebd3be5f91d9045df8ba5a1ee83e85d6bd7873fb6add98afbdd32dbd89dac4e ChangeLog 2260 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163 -MD5 e5c30421e1793900435f9a29b49c91b0 files/digest-rp-l2tp-0.4 235 -RMD160 84fdc230e0b3c6cc38f43fd6f7abd11f2518c06b files/digest-rp-l2tp-0.4 235 -SHA256 f9f0edaa4ca6fee6bb9ce9a76fa29905a07da0c1e288565aff8bdc40c48b7fa7 files/digest-rp-l2tp-0.4 235 +MD5 e5c30421e1793900435f9a29b49c91b0 files/digest-rp-l2tp-0.4-r1 235 +RMD160 84fdc230e0b3c6cc38f43fd6f7abd11f2518c06b files/digest-rp-l2tp-0.4-r1 235 +SHA256 f9f0edaa4ca6fee6bb9ce9a76fa29905a07da0c1e288565aff8bdc40c48b7fa7 files/digest-rp-l2tp-0.4-r1 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFFU0h3sf9c6kjmR8RAt8GAKCIXR2uW/3z09wFBQz+sFwlgcx+FACeKY6c -yHYOky783Ejodg0R4I6Nv8E= -=cgXo +iD8DBQFGIgGUJnxX6mF440QRAmv4AKDc53tWMI5RUShoVLbXmfYxRbjybgCg/EjB +ppC5weHg2PlttD3ZEjpJ3Oo= +=VsRL -----END PGP SIGNATURE----- diff --git a/net-dialup/rp-l2tp/files/digest-rp-l2tp-0.4 b/net-dialup/rp-l2tp/files/digest-rp-l2tp-0.4-r1 similarity index 100% rename from net-dialup/rp-l2tp/files/digest-rp-l2tp-0.4 rename to net-dialup/rp-l2tp/files/digest-rp-l2tp-0.4-r1 diff --git a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.diff b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch similarity index 77% rename from net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.diff rename to net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch index 506a6f07dba0..ded6c9550e6e 100644 --- a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.diff +++ b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch @@ -1,42 +1,18 @@ -diff -Nru rp-l2tp-0.4.orig/Makefile.in rp-l2tp-0.4/Makefile.in ---- rp-l2tp-0.4.orig/Makefile.in 2004-07-01 18:17:11.000000000 +0300 -+++ rp-l2tp-0.4/Makefile.in 2004-11-24 23:36:23.181183832 +0200 -@@ -81,13 +81,13 @@ - - install: all - -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) -- $(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) -- -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp -- $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp/l2tp.conf.example -+ $(install) -m 755 l2tpd $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir)/rp-l2tpd -+ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rp-l2tp -+ $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rp-l2tp/rp-l2tpd.conf.example - -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 - -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 -- $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 -- $(install) -m 644 man/l2tp.conf.5 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 -+ $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8/rp-l2tpd.8 -+ $(install) -m 644 man/l2tp.conf.5 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5/rp-l2tpd.conf.5 - - $(MAKE) -C handlers install +diff -Nru rp-l2tp-0.4.orig/handlers/cmd.c rp-l2tp-0.4/handlers/cmd.c +--- rp-l2tp-0.4.orig/handlers/cmd.c 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/handlers/cmd.c 2007-04-15 13:29:18.000000000 +0300 +@@ -162,7 +162,7 @@ -diff -Nru rp-l2tp-0.4.orig/handlers/Makefile.in rp-l2tp-0.4/handlers/Makefile.in ---- rp-l2tp-0.4.orig/handlers/Makefile.in 2002-09-30 22:45:00.000000000 +0300 -+++ rp-l2tp-0.4/handlers/Makefile.in 2004-11-24 23:36:23.181183832 +0200 -@@ -39,7 +39,7 @@ + /* We have hit the end of our options. Open command socket */ + if (!sockname) { +- sockname = "/var/run/l2tpctrl"; ++ sockname = "/var/run/rp-l2tpdctrl"; + } - install: all - -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) -- -mkdir -p $(RPM_INSTALL_ROOT)$(prefix)/lib/l2tp/plugins -- $(install) -m 755 -s l2tp-control $(RPM_INSTALL_ROOT)$(sbindir) -- $(install) -m 755 $(HANDLERS) $(RPM_INSTALL_ROOT)$(prefix)/lib/l2tp/plugins -+ -mkdir -p $(RPM_INSTALL_ROOT)$(prefix)/lib/rp-l2tpd/plugins -+ $(install) -m 755 l2tp-control $(RPM_INSTALL_ROOT)$(sbindir)/rp-l2tpd-control -+ $(install) -m 755 $(HANDLERS) $(RPM_INSTALL_ROOT)$(prefix)/lib/rp-l2tpd/plugins - distclean: clean + (void) remove(sockname); diff -Nru rp-l2tp-0.4.orig/handlers/cmd-control.c rp-l2tp-0.4/handlers/cmd-control.c ---- rp-l2tp-0.4.orig/handlers/cmd-control.c 2002-09-30 22:45:00.000000000 +0300 -+++ rp-l2tp-0.4/handlers/cmd-control.c 2004-11-24 23:36:23.182183680 +0200 +--- rp-l2tp-0.4.orig/handlers/cmd-control.c 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/handlers/cmd-control.c 2007-04-15 13:29:18.000000000 +0300 @@ -52,7 +52,7 @@ memset(&addr, 0, sizeof(addr)); @@ -46,21 +22,31 @@ diff -Nru rp-l2tp-0.4.orig/handlers/cmd-control.c rp-l2tp-0.4/handlers/cmd-contr fd = socket(AF_LOCAL, SOCK_STREAM, 0); if (fd < 0) { -diff -Nru rp-l2tp-0.4.orig/handlers/cmd.c rp-l2tp-0.4/handlers/cmd.c ---- rp-l2tp-0.4.orig/handlers/cmd.c 2004-07-01 17:58:56.000000000 +0300 -+++ rp-l2tp-0.4/handlers/cmd.c 2004-11-24 23:36:23.182183680 +0200 -@@ -162,7 +162,7 @@ +diff -Nru rp-l2tp-0.4.orig/handlers/Makefile.in rp-l2tp-0.4/handlers/Makefile.in +--- rp-l2tp-0.4.orig/handlers/Makefile.in 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/handlers/Makefile.in 2007-04-15 13:33:41.000000000 +0300 +@@ -9,6 +9,7 @@ + install=@INSTALL@ + install_dir=@INSTALL@ -d + sbindir=@sbindir@ ++libdir=@libdir@ - /* We have hit the end of our options. Open command socket */ - if (!sockname) { -- sockname = "/var/run/l2tpctrl"; -+ sockname = "/var/run/rp-l2tpdctrl"; - } + HANDLERS=sync-pppd.so cmd.so - (void) remove(sockname); +@@ -39,7 +40,7 @@ + + install: all + -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) +- -mkdir -p $(RPM_INSTALL_ROOT)$(prefix)/lib/l2tp/plugins +- $(install) -m 755 -s l2tp-control $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 $(HANDLERS) $(RPM_INSTALL_ROOT)$(prefix)/lib/l2tp/plugins ++ -mkdir -p $(RPM_INSTALL_ROOT)$(libdir)/rp-l2tpd/plugins ++ $(install) -m 755 l2tp-control $(RPM_INSTALL_ROOT)$(sbindir)/rp-l2tpd-control ++ $(install) -m 755 $(HANDLERS) $(RPM_INSTALL_ROOT)$(libdir)/rp-l2tpd/plugins + distclean: clean diff -Nru rp-l2tp-0.4.orig/main.c rp-l2tp-0.4/main.c ---- rp-l2tp-0.4.orig/main.c 2002-09-30 22:45:00.000000000 +0300 -+++ rp-l2tp-0.4/main.c 2004-11-24 23:36:23.183183528 +0200 +--- rp-l2tp-0.4.orig/main.c 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/main.c 2007-04-15 13:29:18.000000000 +0300 @@ -27,7 +27,7 @@ static void usage(int argc, char *argv[], int exitcode) @@ -79,11 +65,48 @@ diff -Nru rp-l2tp-0.4.orig/main.c rp-l2tp-0.4/main.c l2tp_die(); } +diff -Nru rp-l2tp-0.4.orig/Makefile.in rp-l2tp-0.4/Makefile.in +--- rp-l2tp-0.4.orig/Makefile.in 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/Makefile.in 2007-04-15 13:39:09.000000000 +0300 +@@ -25,12 +25,13 @@ + install=@INSTALL@ + install_dir=@INSTALL@ -d + sbindir=@sbindir@ ++libdir=@libdir@ + + OBJS=auth.o debug.o dgram.o main.o md5.o network.o options.o peer.o session.o tunnel.o utils.o + EXTRA_LIBS=@LIBEVENT@/*.o -ldl + + SRCS=$(OBJS:.o=.c) +-CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" ++CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -DLIBDIR=\"$(libdir)\" + + TARGETS=l2tpd libl2tp.a handlers + +@@ -81,13 +82,13 @@ + + install: all + -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) +- $(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) +- -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp +- $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp/l2tp.conf.example ++ $(install) -m 755 l2tpd $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir)/rp-l2tpd ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rp-l2tp ++ $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rp-l2tp/rp-l2tpd.conf.example + -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 + -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 +- $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 +- $(install) -m 644 man/l2tp.conf.5 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 ++ $(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8/rp-l2tpd.8 ++ $(install) -m 644 man/l2tp.conf.5 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5/rp-l2tpd.conf.5 + + $(MAKE) -C handlers install + diff -Nru rp-l2tp-0.4.orig/man/l2tp.conf.5 rp-l2tp-0.4/man/l2tp.conf.5 ---- rp-l2tp-0.4.orig/man/l2tp.conf.5 2004-07-01 17:58:56.000000000 +0300 -+++ rp-l2tp-0.4/man/l2tp.conf.5 2004-11-24 23:47:07.911169976 +0200 +--- rp-l2tp-0.4.orig/man/l2tp.conf.5 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/man/l2tp.conf.5 2007-04-15 13:29:18.000000000 +0300 @@ -1,13 +1,13 @@ - .\" $Id: rp-l2tp-0.4-gentoo.diff,v 1.3 2006/09/23 15:04:50 mrness Exp $ + .\" $Id: rp-l2tp-0.4-gentoo.patch,v 1.1 2007/04/15 10:42:17 mrness Exp $ .\" LIC: GPL -.TH L2TP.CONF 5 "11 March 2002" +.TH RP-L2TPD.CONF 5 "11 March 2002" @@ -113,10 +136,10 @@ diff -Nru rp-l2tp-0.4.orig/man/l2tp.conf.5 rp-l2tp-0.4/man/l2tp.conf.5 -\fBl2tpd\fR was written by David F. Skoll . +\fBrp-l2tpd\fR was written by David F. Skoll . diff -Nru rp-l2tp-0.4.orig/man/l2tpd.8 rp-l2tp-0.4/man/l2tpd.8 ---- rp-l2tp-0.4.orig/man/l2tpd.8 2002-09-30 22:45:00.000000000 +0300 -+++ rp-l2tp-0.4/man/l2tpd.8 2004-11-24 23:44:47.989441312 +0200 +--- rp-l2tp-0.4.orig/man/l2tpd.8 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/man/l2tpd.8 2007-04-15 13:29:18.000000000 +0300 @@ -1,14 +1,14 @@ - .\" $Id: rp-l2tp-0.4-gentoo.diff,v 1.3 2006/09/23 15:04:50 mrness Exp $ + .\" $Id: rp-l2tp-0.4-gentoo.patch,v 1.1 2007/04/15 10:42:17 mrness Exp $ .\" LIC: GPL -.TH L2TPD 8 "11 March 2002" +.TH RP-L2TPD 8 "11 March 2002" @@ -197,14 +220,14 @@ diff -Nru rp-l2tp-0.4.orig/man/l2tpd.8 rp-l2tp-0.4/man/l2tpd.8 +\fBrp-l2tpd\fR was written by David F. Skoll . diff -Nru rp-l2tp-0.4.orig/utils.c rp-l2tp-0.4/utils.c ---- rp-l2tp-0.4.orig/utils.c 2002-09-30 22:45:00.000000000 +0300 -+++ rp-l2tp-0.4/utils.c 2004-11-24 23:36:23.183183528 +0200 +--- rp-l2tp-0.4.orig/utils.c 2007-04-15 13:30:55.000000000 +0300 ++++ rp-l2tp-0.4/utils.c 2007-04-15 13:34:20.000000000 +0300 @@ -196,7 +196,7 @@ if (*fname == '/') { handle = dlopen(fname, RTLD_NOW); } else { - snprintf(buf, sizeof(buf), "%s/lib/l2tp/plugins/%s", PREFIX, fname); -+ snprintf(buf, sizeof(buf), "%s/lib/rp-l2tpd/plugins/%s", PREFIX, fname); ++ snprintf(buf, sizeof(buf), "%s/rp-l2tpd/plugins/%s", LIBDIR, fname); buf[sizeof(buf)-1] = 0; handle = dlopen(buf, RTLD_NOW); } diff --git a/net-dialup/rp-l2tp/rp-l2tp-0.4.ebuild b/net-dialup/rp-l2tp/rp-l2tp-0.4-r1.ebuild similarity index 80% rename from net-dialup/rp-l2tp/rp-l2tp-0.4.ebuild rename to net-dialup/rp-l2tp/rp-l2tp-0.4-r1.ebuild index 6ec4591ffd84..3a3da2a27133 100644 --- a/net-dialup/rp-l2tp/rp-l2tp-0.4.ebuild +++ b/net-dialup/rp-l2tp/rp-l2tp-0.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-l2tp/rp-l2tp-0.4.ebuild,v 1.6 2006/03/16 20:47:47 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-l2tp/rp-l2tp-0.4-r1.ebuild,v 1.1 2007/04/15 10:42:17 mrness Exp $ inherit eutils @@ -9,14 +9,14 @@ HOMEPAGE="http://sourceforge.net/projects/rp-l2tp/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="x86 amd64 ~ppc" +KEYWORDS="amd64 ~ppc x86" SLOT="0" IUSE="" src_unpack() { unpack ${A} - epatch "${FILESDIR}/${P}-gentoo.diff" + epatch "${FILESDIR}/${P}-gentoo.patch" } src_install() { diff --git a/net-dialup/rppppoek/Manifest b/net-dialup/rppppoek/Manifest index 0088963be36b..2397304a7df3 100644 --- a/net-dialup/rppppoek/Manifest +++ b/net-dialup/rppppoek/Manifest @@ -2,14 +2,14 @@ Hash: SHA1 DIST rppppoek-0.40.tar.bz2 472620 RMD160 3ef6e783e84937ba1fc4920e777a24408928031a SHA1 400951883a9d0b092f11a8604f98db97108f7e37 SHA256 089cfbf1ba0c268a23f881ffae392901b38a35f6cfdebead1318e16a566170c4 -EBUILD rppppoek-0.40.ebuild 546 RMD160 7da34af9a79d794b1ab1b65e29aa4806c47d58a2 SHA1 654fc07f7c3592dc001ff82a376f57d11022197b SHA256 f8587ce9895372456833c7a63936aafc2ad7b09b6577b18190dbd49d0a9156f9 -MD5 5148636355d72a5a56511b7abfebcd02 rppppoek-0.40.ebuild 546 -RMD160 7da34af9a79d794b1ab1b65e29aa4806c47d58a2 rppppoek-0.40.ebuild 546 -SHA256 f8587ce9895372456833c7a63936aafc2ad7b09b6577b18190dbd49d0a9156f9 rppppoek-0.40.ebuild 546 -MISC ChangeLog 1321 RMD160 39c8926a23a5a662667b919af173062dbb179a97 SHA1 44904f147e850f3d592d352620907f96bb97096c SHA256 a141777c80247306c54bc89874a9ec3efad8b24ccceeba993edfdcd68079560e -MD5 44515017a7ef1675d7da589b88377372 ChangeLog 1321 -RMD160 39c8926a23a5a662667b919af173062dbb179a97 ChangeLog 1321 -SHA256 a141777c80247306c54bc89874a9ec3efad8b24ccceeba993edfdcd68079560e ChangeLog 1321 +EBUILD rppppoek-0.40.ebuild 545 RMD160 86035488657a5d18b16dddf60942ae18101abda4 SHA1 44e824860858459c9f392f4778c14850fbd0b6a3 SHA256 03e379ddb8b5f179e6d57f4d2551eb831104ff62409a3476ce2b3148427dd86b +MD5 d3bf913ac4dc7244f5f794d0ed27c0d4 rppppoek-0.40.ebuild 545 +RMD160 86035488657a5d18b16dddf60942ae18101abda4 rppppoek-0.40.ebuild 545 +SHA256 03e379ddb8b5f179e6d57f4d2551eb831104ff62409a3476ce2b3148427dd86b rppppoek-0.40.ebuild 545 +MISC ChangeLog 1411 RMD160 a08a09e03ec3b87eb0299c31d558a654e7b0c7eb SHA1 7c221031a37a738da89242017e3f00f6c55b9bcf SHA256 03e9e1e22adcebc08d12664e63a85ed2fe1331d5c7da159f3cf373d1493a6e83 +MD5 524d31ffb3e49b92f56e2a165abbc22e ChangeLog 1411 +RMD160 a08a09e03ec3b87eb0299c31d558a654e7b0c7eb ChangeLog 1411 +SHA256 03e9e1e22adcebc08d12664e63a85ed2fe1331d5c7da159f3cf373d1493a6e83 ChangeLog 1411 MISC metadata.xml 283 RMD160 3f4c541b7dac9b5d41d2285c0bfd7480d7705ae3 SHA1 51367a3b3d6dc3e7a88021c4fde1079dfe7fb477 SHA256 6395648cfa9b70ce3662a27f27475d1a5d3fb0ceb1b47cb520fca22782114b3e MD5 0629a518bafe9606efcdf3cb58e61245 metadata.xml 283 RMD160 3f4c541b7dac9b5d41d2285c0bfd7480d7705ae3 metadata.xml 283 @@ -18,9 +18,9 @@ MD5 ed4307e39766b7a86d81a31a1f8fcaee files/digest-rppppoek-0.40 244 RMD160 907bff27c1409f4c5e15a314701903f663f127b4 files/digest-rppppoek-0.40 244 SHA256 598055266bd4d34b1c48b070af7f4700badb381576c4de95ecc27b15aafbf2b1 files/digest-rppppoek-0.40 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFFVEu3sf9c6kjmR8RAjgZAKChJSqHpIsFYlrHPAKoJMya3XI/YACeMIUR -gQS/QyLEpSOAWzUvHUB+228= -=t+25 +iD8DBQFGIgJgJnxX6mF440QRAsHzAJ92iXuCtxZg0yI6QnTa+zKdoi2wrACfTlds +AsBXxMlTlvdp634JVR8baZE= +=gdgz -----END PGP SIGNATURE----- -- 2.26.2