summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2006-06-15 23:55:19 +0000
committerHanno Boeck <hanno@gentoo.org>2006-06-15 23:55:19 +0000
commit2e97c125464d70e182ea7b26844ef2481a6039d7 (patch)
tree4eaeab83f8577118cbd5a27b489fc51ec36b8da0 /net-misc/vpnc
parentkeepdir on /var/run/vpnc (diff)
downloadhistorical-2e97c125464d70e182ea7b26844ef2481a6039d7.tar.gz
historical-2e97c125464d70e182ea7b26844ef2481a6039d7.tar.bz2
historical-2e97c125464d70e182ea7b26844ef2481a6039d7.zip
keepdir on /var/run/vpnc
Package-Manager: portage-2.1
Diffstat (limited to 'net-misc/vpnc')
-rw-r--r--net-misc/vpnc/Manifest55
-rw-r--r--net-misc/vpnc/files/digest-vpnc-0.3.23
-rw-r--r--net-misc/vpnc/files/digest-vpnc-0.3.33
-rw-r--r--net-misc/vpnc/files/vpnc-0.3.2-64-bit.patch251
-rw-r--r--net-misc/vpnc/files/vpnc-iproute-fix.diff11
-rw-r--r--net-misc/vpnc/vpnc-0.3.2.ebuild33
-rw-r--r--net-misc/vpnc/vpnc-0.3.3.ebuild35
7 files changed, 21 insertions, 370 deletions
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 93ae24d4d43d..e35aa6ee1582 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,43 +1,30 @@
-AUX vpnc-0.3.2-64-bit.patch 8405 RMD160 f15612a9ed3043ee1a4e0dec1e76a5d0a2e65594 SHA1 ac461aca0b12399c9c8da3554929fa2e0072762a SHA256 d46071054d4831fb1a59daa7649b70cb1461ff6ecfc2cba2a6d54dacf5b2cf12 size 8405
-MD5 728254537c733428bbb21c0e6c7f0f1d files/vpnc-0.3.2-64-bit.patch 8405
-RMD160 f15612a9ed3043ee1a4e0dec1e76a5d0a2e65594 files/vpnc-0.3.2-64-bit.patch 8405
-SHA256 d46071054d4831fb1a59daa7649b70cb1461ff6ecfc2cba2a6d54dacf5b2cf12 files/vpnc-0.3.2-64-bit.patch 8405
-AUX vpnc-iproute-fix-2.diff 331 RMD160 38541f070339a35f04f73c496e65a6dac728144b SHA1 b35dd4a93fb10d0892897f8f0a1e538260fe7496 SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4 size 331
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vpnc-iproute-fix-2.diff 331 RMD160 38541f070339a35f04f73c496e65a6dac728144b SHA1 b35dd4a93fb10d0892897f8f0a1e538260fe7496 SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4
MD5 4e1396bc9dfd19b437f5c69af75ca290 files/vpnc-iproute-fix-2.diff 331
RMD160 38541f070339a35f04f73c496e65a6dac728144b files/vpnc-iproute-fix-2.diff 331
SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4 files/vpnc-iproute-fix-2.diff 331
-AUX vpnc-iproute-fix.diff 318 RMD160 cc03da7264a1d29cb39cbcad82951f8a91f35e05 SHA1 039ea327eb3534f8789c08178aff5bd9c9a19d78 SHA256 b1c282dd4492d0e911956c1ea816899018b717b1d5312c3a38c60280653bb2bf size 318
-MD5 23f1f1f9e89e90a8167152ac6a6dccb8 files/vpnc-iproute-fix.diff 318
-RMD160 cc03da7264a1d29cb39cbcad82951f8a91f35e05 files/vpnc-iproute-fix.diff 318
-SHA256 b1c282dd4492d0e911956c1ea816899018b717b1d5312c3a38c60280653bb2bf files/vpnc-iproute-fix.diff 318
-DIST vpnc-0.3.2.tar.gz 56669 RMD160 50700b7abdb5699235febf794578abc4c0b6b930 SHA256 55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488 size 56669
-DIST vpnc-0.3.3.tar.gz 59939 RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7 size 59939
-EBUILD vpnc-0.3.2.ebuild 854 RMD160 261668b84c380d06297d5ad3197cd865501974bc SHA1 243ae2a264126c54222492d63c67d4bc23faa36b SHA256 1431b9f49732d9ca8e067d5192095e7225c761064d958f4c0034eee0e2776f2e size 854
-MD5 902f606380fea4093d70e3c080cc1054 vpnc-0.3.2.ebuild 854
-RMD160 261668b84c380d06297d5ad3197cd865501974bc vpnc-0.3.2.ebuild 854
-SHA256 1431b9f49732d9ca8e067d5192095e7225c761064d958f4c0034eee0e2776f2e vpnc-0.3.2.ebuild 854
-EBUILD vpnc-0.3.3-r1.ebuild 918 RMD160 d2fdc15ad93b70b7c6677ff922b15e14039b0d83 SHA1 440b396ab5acf7f5090d7f8911044ae75b7b4414 SHA256 b42ea507922e8d987e28878122ef47af89e4a843f93646d70d219ef66402513e size 918
-MD5 06b939dc9af4fd16eb22b46d600e710e vpnc-0.3.3-r1.ebuild 918
-RMD160 d2fdc15ad93b70b7c6677ff922b15e14039b0d83 vpnc-0.3.3-r1.ebuild 918
-SHA256 b42ea507922e8d987e28878122ef47af89e4a843f93646d70d219ef66402513e vpnc-0.3.3-r1.ebuild 918
-EBUILD vpnc-0.3.3.ebuild 887 RMD160 d9d6e5ef197b1a2840cdc64748d88960ebfc2221 SHA1 112b75fe331571e25c78e8599d1d623602d61153 SHA256 e0c937a0a3bca7aedc598aecb8b907a173981f66a0b0b1387934f56c10c644f2 size 887
-MD5 b0939d68e6a35e645e2969fe80634358 vpnc-0.3.3.ebuild 887
-RMD160 d9d6e5ef197b1a2840cdc64748d88960ebfc2221 vpnc-0.3.3.ebuild 887
-SHA256 e0c937a0a3bca7aedc598aecb8b907a173981f66a0b0b1387934f56c10c644f2 vpnc-0.3.3.ebuild 887
-MISC ChangeLog 2191 RMD160 3d3418e5c6b0466bf2e71aee7bb99562d529fd08 SHA1 0c90f74b8a3b0432a72e39215d6a64fce0ce3b50 SHA256 4966450f01a533ac10f61a6a9bb78ff5e43b9c4f3cf1dc02edc844938e00abb4 size 2191
-MD5 e28c5f825f3ac418871201370d09b918 ChangeLog 2191
-RMD160 3d3418e5c6b0466bf2e71aee7bb99562d529fd08 ChangeLog 2191
-SHA256 4966450f01a533ac10f61a6a9bb78ff5e43b9c4f3cf1dc02edc844938e00abb4 ChangeLog 2191
-MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 size 217
+DIST vpnc-0.3.3.tar.gz 59939 RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da SHA1 95559e1c5b1f4bc78dc1a0b9f95e1a2d65a84c0a SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
+EBUILD vpnc-0.3.3-r1.ebuild 919 RMD160 a86151e07a94b0d852dbb3ae117fa298cf978b45 SHA1 912e3d9c0031bb34c1320277089ef9c9c08a9b54 SHA256 0d22e7751639a9a87bca21bc54c3bf82f0a525c25672c541ebc5edefef84c5d2
+MD5 c7244f1f6bcd35b1d88f1b71371204a4 vpnc-0.3.3-r1.ebuild 919
+RMD160 a86151e07a94b0d852dbb3ae117fa298cf978b45 vpnc-0.3.3-r1.ebuild 919
+SHA256 0d22e7751639a9a87bca21bc54c3bf82f0a525c25672c541ebc5edefef84c5d2 vpnc-0.3.3-r1.ebuild 919
+MISC ChangeLog 2291 RMD160 8cf615045c25161c26de790da8b27a7c9a7277f4 SHA1 0aef4ebbf96532473faa8da371647f718d634d69 SHA256 8aa88b5c36724080c9d2cd8ac08d36a3ae1b78b2f0f51bc41fe9ba7b9c58c1df
+MD5 2a8363b351c7f80254ebce920821b655 ChangeLog 2291
+RMD160 8cf615045c25161c26de790da8b27a7c9a7277f4 ChangeLog 2291
+SHA256 8aa88b5c36724080c9d2cd8ac08d36a3ae1b78b2f0f51bc41fe9ba7b9c58c1df ChangeLog 2291
+MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 metadata.xml 217
-MD5 c9786d8186b4f42d0059ad9c9e9b20ff files/digest-vpnc-0.3.2 229
-RMD160 785656460e48c8b19b9091103e6162ac8fe73261 files/digest-vpnc-0.3.2 229
-SHA256 8375f496f8e648ea3a14618cc2881235f46f7fea0e1723d20c56f51b7250ab37 files/digest-vpnc-0.3.2 229
-MD5 9cd36e25a31aa320be150f2049cc6a44 files/digest-vpnc-0.3.3 229
-RMD160 d5ecd81ba633bb947aa28019467f3ceb11139112 files/digest-vpnc-0.3.3 229
-SHA256 863fbeabe8d7baaea9ae71a5d59f2bccf55ed9e317a9ae2eab19cead7ee071cf files/digest-vpnc-0.3.3 229
MD5 9cd36e25a31aa320be150f2049cc6a44 files/digest-vpnc-0.3.3-r1 229
RMD160 d5ecd81ba633bb947aa28019467f3ceb11139112 files/digest-vpnc-0.3.3-r1 229
SHA256 863fbeabe8d7baaea9ae71a5d59f2bccf55ed9e317a9ae2eab19cead7ee071cf files/digest-vpnc-0.3.3-r1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEkfOLr2QksT29OyARAmiIAKCSOgvyPS/wPmFc3uk3KLbfuTuLJQCfcH4L
+JZRnFMWu5Nij9CDfQK9MiVo=
+=9C0q
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/digest-vpnc-0.3.2 b/net-misc/vpnc/files/digest-vpnc-0.3.2
deleted file mode 100644
index 62f61b6853c9..000000000000
--- a/net-misc/vpnc/files/digest-vpnc-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aaccdffc5656095a45dfe87c5bf612cb vpnc-0.3.2.tar.gz 56669
-RMD160 50700b7abdb5699235febf794578abc4c0b6b930 vpnc-0.3.2.tar.gz 56669
-SHA256 55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488 vpnc-0.3.2.tar.gz 56669
diff --git a/net-misc/vpnc/files/digest-vpnc-0.3.3 b/net-misc/vpnc/files/digest-vpnc-0.3.3
deleted file mode 100644
index 6082eedf725c..000000000000
--- a/net-misc/vpnc/files/digest-vpnc-0.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7518cff21326fe7eb9795b60c25ae6a vpnc-0.3.3.tar.gz 59939
-RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da vpnc-0.3.3.tar.gz 59939
-SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7 vpnc-0.3.3.tar.gz 59939
diff --git a/net-misc/vpnc/files/vpnc-0.3.2-64-bit.patch b/net-misc/vpnc/files/vpnc-0.3.2-64-bit.patch
deleted file mode 100644
index ec244d3bd1ea..000000000000
--- a/net-misc/vpnc/files/vpnc-0.3.2-64-bit.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -ur /var/zab/src/vpnc-0.3.2/config.c vpnc-0.3.2/config.c
---- /var/zab/src/vpnc-0.3.2/config.c 2004-11-21 16:11:48.000000000 -0800
-+++ vpnc-0.3.2/config.c 2005-01-04 09:58:35.000000000 -0800
-@@ -352,7 +352,7 @@
- const char *p, *q;
-
- for (p = text, q = strchr(p, '\n'); q; p = q+1, q = strchr(p, '\n'))
-- printf("%s%.*s\n", pre, q-p, p);
-+ printf("%s%.*s\n", pre, (int)(q-p), p);
-
- if (*p != '\0')
- printf("%s%s\n", pre, p);
-@@ -423,8 +423,9 @@
- void do_config(int argc, char **argv)
- {
- char *s;
-- int i, c, known, s_len;
-+ int i, c, known;
- int print_config = 0;
-+ size_t s_len;
-
- for (i = 1; i < argc; i++) {
- if (argv[i][0] != '-') {
-diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.c vpnc-0.3.2/isakmp-pkt.c
---- /var/zab/src/vpnc-0.3.2/isakmp-pkt.c 2004-11-21 14:15:41.000000000 -0800
-+++ vpnc-0.3.2/isakmp-pkt.c 2005-01-04 09:56:31.000000000 -0800
-@@ -293,14 +293,14 @@
-
- struct isakmp_payload *new_isakmp_payload(uint8_t type)
- {
-- struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet));
-+ struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload));
- result->type = type;
- return result;
- }
-
- struct isakmp_payload *new_isakmp_data_payload(uint8_t type, const void *data, size_t data_length)
- {
-- struct isakmp_payload *result = xallocc(sizeof(struct isakmp_packet));
-+ struct isakmp_payload *result = xallocc(sizeof(struct isakmp_payload));
-
- if (type != ISAKMP_PAYLOAD_KE && type != ISAKMP_PAYLOAD_HASH
- && type != ISAKMP_PAYLOAD_SIG && type != ISAKMP_PAYLOAD_NONCE
-@@ -697,7 +697,7 @@
- size_t isakmp_data_len;
-
- if (data_len < ISAKMP_PAYLOAD_O) {
-- DEBUG(2, printf("packet to short: len = %d < min = %d\n", data_len, ISAKMP_PAYLOAD_O));
-+ DEBUG(2, printf("packet to short: len = %lld < min = %d\n", (long long)data_len, ISAKMP_PAYLOAD_O));
- reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS;
- goto error;
- }
-@@ -730,8 +730,8 @@
- isakmp_data_len = fetch4();
- hex_dump("len", &isakmp_data_len, UINT32);
- if (o_data_len != isakmp_data_len) {
-- DEBUG(2, printf("isakmp length does not match packet length: isakmp = %d != datalen = %d\n",
-- isakmp_data_len, o_data_len));
-+ DEBUG(2, printf("isakmp length does not match packet length: isakmp = %lld != datalen = %lld\n",
-+ (long long)isakmp_data_len, (long long)o_data_len));
- reason = ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS;
- goto error;
- }
-diff -ur /var/zab/src/vpnc-0.3.2/isakmp-pkt.h vpnc-0.3.2/isakmp-pkt.h
---- /var/zab/src/vpnc-0.3.2/isakmp-pkt.h 2004-11-21 14:15:05.000000000 -0800
-+++ vpnc-0.3.2/isakmp-pkt.h 2005-01-04 10:03:26.000000000 -0800
-@@ -41,7 +41,7 @@
- uint8_t *data;
- } lots;
- } u;
--};
-+} __attribute__((packed));
-
- struct isakmp_payload {
- struct isakmp_payload *next;
-@@ -102,7 +102,7 @@
- struct isakmp_attribute *attributes;
- } modecfg;
- } u;
--};
-+} __attribute__((packed));
-
- struct isakmp_packet {
- uint8_t i_cookie[ISAKMP_COOKIE_LENGTH];
-@@ -112,7 +112,7 @@
- uint8_t flags;
- uint32_t message_id;
- struct isakmp_payload *payload;
--};
-+} __attribute__((packed));
-
- extern void *xallocc(size_t x);
- extern struct isakmp_packet *new_isakmp_packet(void);
-diff -ur /var/zab/src/vpnc-0.3.2/sysdep-bsd.c vpnc-0.3.2/sysdep-bsd.c
---- /var/zab/src/vpnc-0.3.2/sysdep-bsd.c 2004-07-04 06:57:30.000000000 -0700
-+++ vpnc-0.3.2/sysdep-bsd.c 2005-01-04 10:09:21.000000000 -0800
-@@ -74,7 +74,7 @@
- uint32_t timeout;
- } header;
- u_char data[MAX_MRU];
--};
-+} __attribute__((packed));
-
- /* Read/write frames from TUN device */
- int tun_write(int fd, char *buf, int len)
-diff -ur /var/zab/src/vpnc-0.3.2/tunip.c vpnc-0.3.2/tunip.c
---- /var/zab/src/vpnc-0.3.2/tunip.c 2004-11-17 12:23:43.000000000 -0800
-+++ vpnc-0.3.2/tunip.c 2005-01-04 10:56:06.000000000 -0800
-@@ -87,8 +87,8 @@
- unsigned char use_fallback; /* use initial address as fallback? */
- unsigned char use_dest; /* is dest address known yet? */
-
-- unsigned long spi; /* security parameters index */
-- unsigned long seq_id; /* for replay protection (not implemented) */
-+ uint32_t spi; /* security parameters index */
-+ uint32_t seq_id; /* for replay protection (not implemented) */
-
- /* Encryption key */
- const unsigned char *enc_secret;
-@@ -118,12 +118,12 @@
-
- /* A real ESP header (RFC 2406) */
- typedef struct esp_encap_header {
-- unsigned long spi; /* security parameters index */
-- unsigned long seq_id; /* sequence id (unimplemented) */
-+ uint32_t spi; /* security parameters index */
-+ uint32_t seq_id; /* sequence id (unimplemented) */
- /* variable-length payload data + padding */
- /* unsigned char next_header */
- /* optional auth data */
--} esp_encap_header_t;
-+} esp_encap_header_t __attribute__((packed));
-
- struct encap_method {
- int fd; /* file descriptor for relevant socket */
-@@ -136,7 +136,7 @@
- unsigned int bufsize, bufpayload, var_header_size;
- int buflen;
- struct sockaddr_in from;
-- int fromlen;
-+ socklen_t fromlen;
-
- int (*recv) (struct encap_method * encap,
- unsigned char *buf, unsigned int bufsize, struct sockaddr_in * from);
-@@ -151,7 +151,7 @@
- struct peer_desc *peer, unsigned char *buf, unsigned int bufsize);
- void encap_udp_send_peer(struct encap_method *encap,
- struct peer_desc *peer, unsigned char *buf, unsigned int bufsize);
--struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap);
-+struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap);
- int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer);
-
- /* Yuck! Global variables... */
-@@ -220,7 +220,7 @@
- int encap_rawip_recv(struct encap_method *encap,
- unsigned char *buf, unsigned int bufsize, struct sockaddr_in *from)
- {
-- int r;
-+ ssize_t r;
- struct ip *p = (struct ip *)buf;
-
- encap->fromlen = sizeof(encap->from);
-@@ -231,7 +231,10 @@
- return -1;
- }
- if (r < (p->ip_hl << 2) + encap->fixed_header_size) {
-- syslog(LOG_ALERT, "packet too short from %s", inet_ntoa(encap->from.sin_addr));
-+#if 0
-+ syslog(LOG_ALERT, "packet too short from %s",
-+ inet_ntoa(encap->from.sin_addr));
-+#endif
- return -1;
- }
- #if 0
-@@ -268,7 +271,7 @@
- unsigned char *buf, unsigned int bufsize,
- struct sockaddr_in *from)
- {
-- int r;
-+ ssize_t r;
-
- encap->fromlen = sizeof(encap->from);
-
-@@ -279,8 +282,10 @@
- return -1;
- }
- if (r < encap->fixed_header_size) {
-+#if 0
- syslog(LOG_ALERT, "packet too short from %s",
- inet_ntoa(encap->from.sin_addr));
-+#endif
- return -1;
- }
-
-@@ -447,11 +452,11 @@
- /*
- * Find the peer record associated with a given local SPI.
- */
--struct peer_desc *peer_find(unsigned long spi, struct encap_method *encap)
-+struct peer_desc *peer_find(uint32_t spi, struct encap_method *encap)
- {
- if (vpnpeer.local_sa->spi == spi && vpnpeer.local_sa->em == encap)
- return &vpnpeer;
-- syslog(LOG_ALERT, "unknown spi %ld", spi);
-+ syslog(LOG_ALERT, "unknown spi %u", spi);
- return NULL;
- }
-
-@@ -623,7 +628,7 @@
- return;
- }
- if (sent != encap->buflen)
-- syslog(LOG_ALERT, "truncated out (%d out of %d)", sent, encap->buflen);
-+ syslog(LOG_ALERT, "truncated out (%llu out of %d)", (unsigned long long)sent, encap->buflen);
- }
-
- /*
-@@ -659,8 +664,8 @@
- return;
- }
- if (sent != encap->buflen)
-- syslog(LOG_ALERT, "truncated out (%Zd out of %Zd)",
-- sent, encap->buflen);
-+ syslog(LOG_ALERT, "truncated out (%lld out of %d)",
-+ (long long)sent, encap->buflen);
- }
-
- int encap_esp_recv_peer(struct encap_method *encap, struct peer_desc *peer)
-@@ -838,7 +843,7 @@
- char addr1[16];
- strcpy(addr1, inet_ntoa(peer->remote_sa->dest.sin_addr));
- syslog(LOG_NOTICE,
-- "spi %ld: remote address changed from %s to %s",
-+ "spi %u: remote address changed from %s to %s",
- peer->remote_sa->spi, addr1, inet_ntoa(from.sin_addr));
- peer->remote_sa->dest.sin_addr.s_addr = from.sin_addr.s_addr;
- peer->remote_sa->use_dest = 1;
-diff -ur /var/zab/src/vpnc-0.3.2/vpnc.c vpnc-0.3.2/vpnc.c
---- /var/zab/src/vpnc-0.3.2/vpnc.c 2004-11-21 16:12:02.000000000 -0800
-+++ vpnc-0.3.2/vpnc.c 2005-01-04 09:55:37.000000000 -0800
-@@ -468,8 +468,8 @@
- *r_p = NULL;
-
- if (r_length < ISAKMP_PAYLOAD_O || ((r_length - ISAKMP_PAYLOAD_O) % s->ivlen != 0)) {
-- DEBUG(2, printf("payload to short or not padded: len=%d, min=%d (ivlen=%d)\n",
-- r_length, ISAKMP_PAYLOAD_O, s->ivlen));
-+ DEBUG(2, printf("payload to short or not padded: len=%lld, min=%d (ivlen=%lld)\n",
-+ (long long)r_length, ISAKMP_PAYLOAD_O, (long long)s->ivlen));
- return ISAKMP_N_UNEQUAL_PAYLOAD_LENGTHS;
- }
-
diff --git a/net-misc/vpnc/files/vpnc-iproute-fix.diff b/net-misc/vpnc/files/vpnc-iproute-fix.diff
deleted file mode 100644
index 068b993c09da..000000000000
--- a/net-misc/vpnc/files/vpnc-iproute-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vpnc-orig/vpnc-script 2005-10-24 10:22:38.356287000 +0200
-+++ vpnc/vpnc-script 2005-10-24 10:22:46.812815500 +0200
-@@ -72,7 +72,7 @@
-
- if [ -n "$IPROUTE" ]; then
- fix_ip_get_output () {
-- sed 's/cache//;s/metric[0-9]\+ [0-9]\+//g'
-+ sed 's/cache//;s/metric [0-9]\+ [0-9]\+//g'
- }
-
- set_vpngateway_route() {
diff --git a/net-misc/vpnc/vpnc-0.3.2.ebuild b/net-misc/vpnc/vpnc-0.3.2.ebuild
deleted file mode 100644
index a4475553c9d9..000000000000
--- a/net-misc/vpnc/vpnc-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.2.ebuild,v 1.6 2005/07/10 23:41:00 weeve Exp $
-
-inherit eutils
-
-DESCRIPTION="Free client for Cisco VPN routing software"
-HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libgcrypt-1.1.91
- sys-apps/iproute2"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-64-bit.patch
- # Workaround for crappy Makefile
- sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-}
-
-src_install() {
- dobin vpnc vpnc-connect vpnc-disconnect || die
- dodoc ChangeLog README TODO VERSION
- doman vpnc.8
- insinto /etc
- doins vpnc.conf
-}
diff --git a/net-misc/vpnc/vpnc-0.3.3.ebuild b/net-misc/vpnc/vpnc-0.3.3.ebuild
deleted file mode 100644
index b448fe2b69e3..000000000000
--- a/net-misc/vpnc/vpnc-0.3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.3.ebuild,v 1.1 2005/10/24 08:30:04 hanno Exp $
-
-inherit eutils
-
-DESCRIPTION="Free client for Cisco VPN routing software"
-HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libgcrypt-1.1.91
- sys-apps/iproute2"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/vpnc-iproute-fix.diff
- # Workaround for crappy Makefile
- sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-}
-
-src_install() {
- dobin vpnc vpnc-disconnect pcf2vpnc
- dodoc ChangeLog README TODO VERSION
- doman vpnc.8
- insinto /etc
- doins vpnc.conf
- exeinto /etc/vpnc
- doexe vpnc-script
-}