diff options
author | Leonardo Arena <rnalrd@gmail.com> | 2010-10-27 09:44:27 +0000 |
---|---|---|
committer | Leonardo Arena <rnalrd@gmail.com> | 2010-10-27 09:44:27 +0000 |
commit | 99345acd4e8411263c6cc0b1ef262f851daae477 (patch) | |
tree | 47468e04fd4d0f53e885764c248e99f30d6746b8 | |
parent | 4fc5f8b372dcb1f7e2e6dda765dbc3b4fe607ee4 (diff) | |
parent | d59c2cf53b0dd3cb9556eb286da17250e7b1976b (diff) | |
download | alpine_aports-99345acd4e8411263c6cc0b1ef262f851daae477.tar.bz2 alpine_aports-99345acd4e8411263c6cc0b1ef262f851daae477.tar.xz alpine_aports-99345acd4e8411263c6cc0b1ef262f851daae477.zip |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports
22 files changed, 140 insertions, 839 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index c0f40a95e2..d4e9648953 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=busybox | 2 | pkgname=busybox |
3 | pkgver=1.17.3 | 3 | pkgver=1.17.3 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" | 5 | pkgdesc="Size optimized toolbox of many common UNIX utilities" |
6 | url=http://busybox.net | 6 | url=http://busybox.net |
7 | license="GPL-2" | 7 | license="GPL-2" |
@@ -10,6 +10,7 @@ install="$pkgname.post-install $pkgname.post-upgrade" | |||
10 | subpackages="$pkgname-static" | 10 | subpackages="$pkgname-static" |
11 | triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" | 11 | triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" |
12 | source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 | 12 | source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 |
13 | http://busybox.net/downloads/fixes-1.17.3/busybox-1.17.3-sort.patch | ||
13 | $pkgname-1.11.1-bb.patch | 14 | $pkgname-1.11.1-bb.patch |
14 | busyboxconfig" | 15 | busyboxconfig" |
15 | 16 | ||
@@ -68,5 +69,6 @@ static() { | |||
68 | } | 69 | } |
69 | 70 | ||
70 | md5sums="a2ce1a951571da8c6e0eaf75b1acef60 busybox-1.17.3.tar.bz2 | 71 | md5sums="a2ce1a951571da8c6e0eaf75b1acef60 busybox-1.17.3.tar.bz2 |
72 | 6d9c722fdbefda5ed408da63dc6bbefe busybox-1.17.3-sort.patch | ||
71 | 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch | 73 | 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch |
72 | 403e0b9fe99a7a18c5b9ae91283a5f9a busyboxconfig" | 74 | 403e0b9fe99a7a18c5b9ae91283a5f9a busyboxconfig" |
diff --git a/main/busybox/busybox.trigger b/main/busybox/busybox.trigger index 8bdef2ba56..2f69f76ceb 100644 --- a/main/busybox/busybox.trigger +++ b/main/busybox/busybox.trigger | |||
@@ -4,7 +4,11 @@ do_bb_install= | |||
4 | 4 | ||
5 | for i in "$@"; do | 5 | for i in "$@"; do |
6 | case "$i" in | 6 | case "$i" in |
7 | /lib/modules/*) /bin/busybox depmod ${i#/lib/modules/};; | 7 | /lib/modules/*) |
8 | if [ -d "$i" ]; then | ||
9 | /bin/busybox depmod ${i#/lib/modules/} | ||
10 | fi | ||
11 | ;; | ||
8 | *) do_bb_install=yes;; | 12 | *) do_bb_install=yes;; |
9 | esac | 13 | esac |
10 | done | 14 | done |
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index d7c8052cbc..e2b3ca7e77 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ffmpeg | 2 | pkgname=ffmpeg |
3 | pkgver=0.6.1 | 3 | pkgver=0.6.1 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" | 5 | pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" |
6 | url="http://ffmpeg.mplayerhq.hu/" | 6 | url="http://ffmpeg.mplayerhq.hu/" |
7 | license="GPL" | 7 | license="GPL" |
diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index b21117c4ba..65bc6451b7 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gst-plugins-ugly | 2 | pkgname=gst-plugins-ugly |
3 | pkgver=0.10.16 | 3 | pkgver=0.10.16 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" | 5 | pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" |
6 | url="http://gstreamer.freedesktop.org/" | 6 | url="http://gstreamer.freedesktop.org/" |
7 | license="LGPL" | 7 | license="LGPL" |
diff --git a/main/ipsec-tools/60-debug-quick.patch b/main/ipsec-tools/60-debug-quick.patch deleted file mode 100644 index a5c3346ee9..0000000000 --- a/main/ipsec-tools/60-debug-quick.patch +++ /dev/null | |||
@@ -1,211 +0,0 @@ | |||
1 | debugging prints for quick mode errors | ||
2 | |||
3 | From: Timo Teras <timo.teras@iki.fi> | ||
4 | |||
5 | |||
6 | --- | ||
7 | |||
8 | src/racoon/isakmp.c | 21 ++++++++++++++------- | ||
9 | src/racoon/isakmp_quick.c | 46 ++++++++++++++++++++++++++++++++++++++------- | ||
10 | 2 files changed, 53 insertions(+), 14 deletions(-) | ||
11 | |||
12 | |||
13 | diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c | ||
14 | index 2dfda2f..87ce598 100644 | ||
15 | --- a/src/racoon/isakmp.c | ||
16 | +++ b/src/racoon/isakmp.c | ||
17 | @@ -817,7 +817,8 @@ ph1_main(iph1, msg) | ||
18 | |||
19 | if (iph1->side == RESPONDER && iph1->status == PHASE1ST_START) { | ||
20 | plog(LLV_ERROR, LOCATION, iph1->remote, | ||
21 | - "failed to pre-process packet.\n"); | ||
22 | + "failed to pre-process ph1 packet (side: %d, status %d).\n", | ||
23 | + iph1->side, iph1->status); | ||
24 | return -1; | ||
25 | } else { | ||
26 | /* ignore the error and keep phase 1 handler */ | ||
27 | @@ -845,7 +846,8 @@ ph1_main(iph1, msg) | ||
28 | [iph1->side] | ||
29 | [iph1->status])(iph1, msg) != 0) { | ||
30 | plog(LLV_ERROR, LOCATION, iph1->remote, | ||
31 | - "failed to process packet.\n"); | ||
32 | + "failed to process ph1 packet (side: %d, status: %d).\n", | ||
33 | + iph1->side, iph1->status); | ||
34 | return -1; | ||
35 | } | ||
36 | |||
37 | @@ -997,7 +999,8 @@ quick_main(iph2, msg) | ||
38 | [iph2->status])(iph2, msg); | ||
39 | if (error != 0) { | ||
40 | plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
41 | - "failed to pre-process packet.\n"); | ||
42 | + "failed to pre-process ph2 packet (side: %d, status %d).\n", | ||
43 | + iph2->side, iph2->status); | ||
44 | if (error == ISAKMP_INTERNAL_ERROR) | ||
45 | return 0; | ||
46 | isakmp_info_send_n1(iph2->ph1, error, NULL); | ||
47 | @@ -1025,7 +1028,8 @@ quick_main(iph2, msg) | ||
48 | [iph2->side] | ||
49 | [iph2->status])(iph2, msg) != 0) { | ||
50 | plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
51 | - "failed to process packet.\n"); | ||
52 | + "failed to process ph2 packet (side: %d, status: %d).\n", | ||
53 | + iph2->side, iph2->status); | ||
54 | return -1; | ||
55 | } | ||
56 | |||
57 | @@ -1233,7 +1237,8 @@ isakmp_ph1begin_r(msg, remote, local, etype) | ||
58 | [iph1->side] | ||
59 | [iph1->status])(iph1, msg) < 0) { | ||
60 | plog(LLV_ERROR, LOCATION, remote, | ||
61 | - "failed to process packet.\n"); | ||
62 | + "failed to process ph1 packet (side: %d, status: %d).\n", | ||
63 | + iph1->side, iph1->status); | ||
64 | remph1(iph1); | ||
65 | delph1(iph1); | ||
66 | return -1; | ||
67 | @@ -1386,7 +1391,8 @@ isakmp_ph2begin_r(iph1, msg) | ||
68 | [iph2->status])(iph2, msg); | ||
69 | if (error != 0) { | ||
70 | plog(LLV_ERROR, LOCATION, iph1->remote, | ||
71 | - "failed to pre-process packet.\n"); | ||
72 | + "failed to pre-process ph2 packet (side: %d, status: %d).\n", | ||
73 | + iph2->side, iph2->status); | ||
74 | if (error != ISAKMP_INTERNAL_ERROR) | ||
75 | isakmp_info_send_n1(iph2->ph1, error, NULL); | ||
76 | /* | ||
77 | @@ -1404,7 +1410,8 @@ isakmp_ph2begin_r(iph1, msg) | ||
78 | [iph2->side] | ||
79 | [iph2->status])(iph2, msg) < 0) { | ||
80 | plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
81 | - "failed to process packet.\n"); | ||
82 | + "failed to process ph2 packet (side: %d, status: %d).\n", | ||
83 | + iph2->side, iph2->status); | ||
84 | /* don't release handler */ | ||
85 | return -1; | ||
86 | } | ||
87 | diff --git a/src/racoon/isakmp_quick.c b/src/racoon/isakmp_quick.c | ||
88 | index 46c84c1..2657407 100644 | ||
89 | --- a/src/racoon/isakmp_quick.c | ||
90 | +++ b/src/racoon/isakmp_quick.c | ||
91 | @@ -495,18 +495,27 @@ quick_i2recv(iph2, msg0) | ||
92 | "isn't supported.\n"); | ||
93 | break; | ||
94 | } | ||
95 | - if (isakmp_p2ph(&iph2->sa_ret, pa->ptr) < 0) | ||
96 | + if (isakmp_p2ph(&iph2->sa_ret, pa->ptr) < 0) { | ||
97 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
98 | + "duplicate ISAKMP_NPTYPE_SA.\n"); | ||
99 | goto end; | ||
100 | + } | ||
101 | break; | ||
102 | |||
103 | case ISAKMP_NPTYPE_NONCE: | ||
104 | - if (isakmp_p2ph(&iph2->nonce_p, pa->ptr) < 0) | ||
105 | + if (isakmp_p2ph(&iph2->nonce_p, pa->ptr) < 0) { | ||
106 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
107 | + "duplicate ISAKMP_NPTYPE_NONCE.\n"); | ||
108 | goto end; | ||
109 | + } | ||
110 | break; | ||
111 | |||
112 | case ISAKMP_NPTYPE_KE: | ||
113 | - if (isakmp_p2ph(&iph2->dhpub_p, pa->ptr) < 0) | ||
114 | + if (isakmp_p2ph(&iph2->dhpub_p, pa->ptr) < 0) { | ||
115 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
116 | + "duplicate ISAKMP_NPTYPE_KE.\n"); | ||
117 | goto end; | ||
118 | + } | ||
119 | break; | ||
120 | |||
121 | case ISAKMP_NPTYPE_ID: | ||
122 | @@ -517,6 +526,8 @@ quick_i2recv(iph2, msg0) | ||
123 | if (isakmp_p2ph(&idcr, pa->ptr) < 0) | ||
124 | goto end; | ||
125 | } else { | ||
126 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
127 | + "too many ISAKMP_NPTYPE_ID payloads.\n"); | ||
128 | goto end; | ||
129 | } | ||
130 | break; | ||
131 | @@ -557,6 +568,8 @@ quick_i2recv(iph2, msg0) | ||
132 | iph2->natoa_dst = daddr; | ||
133 | else { | ||
134 | racoon_free(daddr); | ||
135 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
136 | + "too many ISAKMP_NPTYPE_NATOA payloads.\n"); | ||
137 | goto end; | ||
138 | } | ||
139 | } | ||
140 | @@ -718,6 +731,8 @@ quick_i2recv(iph2, msg0) | ||
141 | |||
142 | /* validity check SA payload sent from responder */ | ||
143 | if (ipsecdoi_checkph2proposal(iph2) < 0) { | ||
144 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
145 | + "proposal check failed.\n"); | ||
146 | error = ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN; | ||
147 | goto end; | ||
148 | } | ||
149 | @@ -1077,8 +1092,11 @@ quick_r1recv(iph2, msg0) | ||
150 | } | ||
151 | /* decrypt packet */ | ||
152 | msg = oakley_do_decrypt(iph2->ph1, msg0, iph2->ivm->iv, iph2->ivm->ive); | ||
153 | - if (msg == NULL) | ||
154 | + if (msg == NULL) { | ||
155 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
156 | + "Packet decryption failed.\n"); | ||
157 | goto end; | ||
158 | + } | ||
159 | |||
160 | /* create buffer for using to validate HASH(1) */ | ||
161 | /* | ||
162 | @@ -1162,18 +1180,27 @@ quick_r1recv(iph2, msg0) | ||
163 | "Multi SAs isn't supported.\n"); | ||
164 | goto end; | ||
165 | } | ||
166 | - if (isakmp_p2ph(&iph2->sa, pa->ptr) < 0) | ||
167 | + if (isakmp_p2ph(&iph2->sa, pa->ptr) < 0) { | ||
168 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
169 | + "duplicate ISAKMP_NPTYPE_SA.\n"); | ||
170 | goto end; | ||
171 | + } | ||
172 | break; | ||
173 | |||
174 | case ISAKMP_NPTYPE_NONCE: | ||
175 | - if (isakmp_p2ph(&iph2->nonce_p, pa->ptr) < 0) | ||
176 | + if (isakmp_p2ph(&iph2->nonce_p, pa->ptr) < 0) { | ||
177 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
178 | + "duplicate ISAKMP_NPTYPE_NONCE.\n"); | ||
179 | goto end; | ||
180 | + } | ||
181 | break; | ||
182 | |||
183 | case ISAKMP_NPTYPE_KE: | ||
184 | - if (isakmp_p2ph(&iph2->dhpub_p, pa->ptr) < 0) | ||
185 | + if (isakmp_p2ph(&iph2->dhpub_p, pa->ptr) < 0) { | ||
186 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
187 | + "duplicate ISAKMP_NPTYPE_KE.\n"); | ||
188 | goto end; | ||
189 | + } | ||
190 | break; | ||
191 | |||
192 | case ISAKMP_NPTYPE_ID: | ||
193 | @@ -1241,6 +1268,9 @@ quick_r1recv(iph2, msg0) | ||
194 | iph2->natoa_src = daddr; | ||
195 | else { | ||
196 | racoon_free(daddr); | ||
197 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
198 | + "received too many NAT-OA payloads.\n"); | ||
199 | + error = ISAKMP_NTYPE_PAYLOAD_MALFORMED; | ||
200 | goto end; | ||
201 | } | ||
202 | } | ||
203 | @@ -1333,6 +1363,8 @@ quick_r1recv(iph2, msg0) | ||
204 | case 0: | ||
205 | /* select single proposal or reject it. */ | ||
206 | if (ipsecdoi_selectph2proposal(iph2) < 0) { | ||
207 | + plog(LLV_ERROR, LOCATION, iph2->ph1->remote, | ||
208 | + "no proposal chosen.\n"); | ||
209 | error = ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN; | ||
210 | goto end; | ||
211 | } | ||
diff --git a/main/ipsec-tools/90-dpd-window-fix.patch b/main/ipsec-tools/90-dpd-window-fix.patch new file mode 100644 index 0000000000..d3ac9a9aa2 --- /dev/null +++ b/main/ipsec-tools/90-dpd-window-fix.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | Index: src/racoon/isakmp_inf.c | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c,v | ||
4 | retrieving revision 1.41 | ||
5 | diff -u -r1.41 isakmp_inf.c | ||
6 | --- a/src/racoon/isakmp_inf.c 3 Jul 2009 06:41:46 -0000 1.41 | ||
7 | +++ b/src/racoon/isakmp_inf.c 5 May 2010 15:56:38 -0000 | ||
8 | @@ -1450,17 +1450,16 @@ | ||
9 | struct isakmp_pl_ru *ru; | ||
10 | u_int32_t msgid; | ||
11 | { | ||
12 | + u_int32_t seq; | ||
13 | |||
14 | plog(LLV_DEBUG, LOCATION, iph1->remote, | ||
15 | "DPD R-U-There-Ack received\n"); | ||
16 | |||
17 | - /* XXX Maintain window of acceptable sequence numbers ? | ||
18 | - * => ru->data <= iph2->dpd_seq && | ||
19 | - * ru->data >= iph2->dpd_seq - iph2->dpd_fails ? */ | ||
20 | - if (ntohl(ru->data) != iph1->dpd_seq-1) { | ||
21 | + seq = ntohl(ru->data); | ||
22 | + if (seq <= iph1->dpd_last_ack || seq > iph1->dpd_seq) { | ||
23 | plog(LLV_ERROR, LOCATION, iph1->remote, | ||
24 | - "Wrong DPD sequence number (%d, %d expected).\n", | ||
25 | - ntohl(ru->data), iph1->dpd_seq-1); | ||
26 | + "Wrong DPD sequence number (%d; last_ack=%d, seq=%d).\n", | ||
27 | + seq, iph1->dpd_last_ack, iph1->dpd_seq); | ||
28 | return 0; | ||
29 | } | ||
30 | |||
31 | @@ -1472,6 +1471,7 @@ | ||
32 | } | ||
33 | |||
34 | iph1->dpd_fails = 0; | ||
35 | + iph1->dpd_last_ack = seq; | ||
36 | sched_cancel(&iph1->dpd_r_u); | ||
37 | isakmp_sched_r_u(iph1, 0); | ||
38 | |||
39 | @@ -1535,12 +1535,13 @@ | ||
40 | memcpy(ru->i_ck, iph1->index.i_ck, sizeof(cookie_t)); | ||
41 | memcpy(ru->r_ck, iph1->index.r_ck, sizeof(cookie_t)); | ||
42 | |||
43 | - if (iph1->dpd_seq == 0){ | ||
44 | + if (iph1->dpd_seq == 0) { | ||
45 | /* generate a random seq which is not too big */ | ||
46 | - srand(time(NULL)); | ||
47 | - iph1->dpd_seq = rand() & 0x0fff; | ||
48 | + iph1->dpd_seq = iph1->dpd_last_ack = rand() & 0x0fff; | ||
49 | } | ||
50 | |||
51 | + iph1->dpd_seq++; | ||
52 | + iph1->dpd_fails++; | ||
53 | ru->data = htonl(iph1->dpd_seq); | ||
54 | |||
55 | error = isakmp_info_send_common(iph1, payload, ISAKMP_NPTYPE_N, 0); | ||
56 | @@ -1549,12 +1550,6 @@ | ||
57 | plog(LLV_DEBUG, LOCATION, iph1->remote, | ||
58 | "DPD R-U-There sent (%d)\n", error); | ||
59 | |||
60 | - /* will be decreased if ACK received... */ | ||
61 | - iph1->dpd_fails++; | ||
62 | - | ||
63 | - /* XXX should be increased only when ACKed ? */ | ||
64 | - iph1->dpd_seq++; | ||
65 | - | ||
66 | /* Reschedule the r_u_there with a short delay, | ||
67 | * will be deleted/rescheduled if ACK received before */ | ||
68 | isakmp_sched_r_u(iph1, 1); | ||
69 | Index: src/racoon/handler.h | ||
70 | =================================================================== | ||
71 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v | ||
72 | retrieving revision 1.22 | ||
73 | diff -u -r1.22 handler.h | ||
74 | --- a/src/racoon/handler.h 3 Sep 2009 09:29:07 -0000 1.22 | ||
75 | +++ b/src/racoon/handler.h 5 May 2010 15:56:39 -0000 | ||
76 | @@ -202,7 +202,8 @@ | ||
77 | |||
78 | #ifdef ENABLE_DPD | ||
79 | int dpd_support; /* Does remote supports DPD ? */ | ||
80 | - u_int16_t dpd_seq; /* DPD seq number to receive */ | ||
81 | + u_int32_t dpd_last_ack; | ||
82 | + u_int32_t dpd_seq; /* DPD seq number to receive */ | ||
83 | u_int8_t dpd_fails; /* number of failures */ | ||
84 | struct sched dpd_r_u; | ||
85 | #endif | ||
diff --git a/main/ipsec-tools/90-openssl-oneshot.patch b/main/ipsec-tools/90-openssl-oneshot.patch deleted file mode 100644 index ece12a52dd..0000000000 --- a/main/ipsec-tools/90-openssl-oneshot.patch +++ /dev/null | |||
@@ -1,210 +0,0 @@ | |||
1 | Index: src/racoon/crypto_openssl.c | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c,v | ||
4 | retrieving revision 1.19 | ||
5 | diff -u -r1.19 crypto_openssl.c | ||
6 | --- a/src/racoon/crypto_openssl.c 29 Apr 2009 10:50:01 -0000 1.19 | ||
7 | +++ b/src/racoon/crypto_openssl.c 4 Jun 2010 09:13:18 -0000 | ||
8 | @@ -1800,6 +1800,42 @@ | ||
9 | return (caddr_t)c; | ||
10 | } | ||
11 | |||
12 | +static vchar_t *eay_hmac_one(key, data, type) | ||
13 | + vchar_t *key, *data; | ||
14 | + const EVP_MD *type; | ||
15 | +{ | ||
16 | + vchar_t *res; | ||
17 | + | ||
18 | + if ((res = vmalloc(EVP_MD_size(type))) == 0) | ||
19 | + return NULL; | ||
20 | + | ||
21 | + if (!HMAC(type, (void *) key->v, key->l, | ||
22 | + (void *) data->v, data->l, (void *) res->v, NULL)) { | ||
23 | + vfree(res); | ||
24 | + return NULL; | ||
25 | + } | ||
26 | + | ||
27 | + return res; | ||
28 | +} | ||
29 | + | ||
30 | +static vchar_t *eay_digest_one(data, type) | ||
31 | + vchar_t *data; | ||
32 | + const EVP_MD *type; | ||
33 | +{ | ||
34 | + vchar_t *res; | ||
35 | + | ||
36 | + if ((res = vmalloc(EVP_MD_size(type))) == 0) | ||
37 | + return NULL; | ||
38 | + | ||
39 | + if (!EVP_Digest((void *) data->v, data->l, | ||
40 | + (void *) res->v, NULL, type, NULL)) { | ||
41 | + vfree(res); | ||
42 | + return NULL; | ||
43 | + } | ||
44 | + | ||
45 | + return res; | ||
46 | +} | ||
47 | + | ||
48 | #ifdef WITH_SHA2 | ||
49 | /* | ||
50 | * HMAC SHA2-512 | ||
51 | @@ -1808,14 +1844,7 @@ | ||
52 | eay_hmacsha2_512_one(key, data) | ||
53 | vchar_t *key, *data; | ||
54 | { | ||
55 | - vchar_t *res; | ||
56 | - caddr_t ctx; | ||
57 | - | ||
58 | - ctx = eay_hmacsha2_512_init(key); | ||
59 | - eay_hmacsha2_512_update(ctx, data); | ||
60 | - res = eay_hmacsha2_512_final(ctx); | ||
61 | - | ||
62 | - return(res); | ||
63 | + return eay_hmac_one(key, data, EVP_sha2_512()); | ||
64 | } | ||
65 | |||
66 | caddr_t | ||
67 | @@ -1865,14 +1894,7 @@ | ||
68 | eay_hmacsha2_384_one(key, data) | ||
69 | vchar_t *key, *data; | ||
70 | { | ||
71 | - vchar_t *res; | ||
72 | - caddr_t ctx; | ||
73 | - | ||
74 | - ctx = eay_hmacsha2_384_init(key); | ||
75 | - eay_hmacsha2_384_update(ctx, data); | ||
76 | - res = eay_hmacsha2_384_final(ctx); | ||
77 | - | ||
78 | - return(res); | ||
79 | + return eay_hmac_one(key, data, EVP_sha2_384()); | ||
80 | } | ||
81 | |||
82 | caddr_t | ||
83 | @@ -1922,14 +1944,7 @@ | ||
84 | eay_hmacsha2_256_one(key, data) | ||
85 | vchar_t *key, *data; | ||
86 | { | ||
87 | - vchar_t *res; | ||
88 | - caddr_t ctx; | ||
89 | - | ||
90 | - ctx = eay_hmacsha2_256_init(key); | ||
91 | - eay_hmacsha2_256_update(ctx, data); | ||
92 | - res = eay_hmacsha2_256_final(ctx); | ||
93 | - | ||
94 | - return(res); | ||
95 | + return eay_hmac_one(key, data, EVP_sha2_256()); | ||
96 | } | ||
97 | |||
98 | caddr_t | ||
99 | @@ -1980,14 +1995,7 @@ | ||
100 | eay_hmacsha1_one(key, data) | ||
101 | vchar_t *key, *data; | ||
102 | { | ||
103 | - vchar_t *res; | ||
104 | - caddr_t ctx; | ||
105 | - | ||
106 | - ctx = eay_hmacsha1_init(key); | ||
107 | - eay_hmacsha1_update(ctx, data); | ||
108 | - res = eay_hmacsha1_final(ctx); | ||
109 | - | ||
110 | - return(res); | ||
111 | + return eay_hmac_one(key, data, EVP_sha1()); | ||
112 | } | ||
113 | |||
114 | caddr_t | ||
115 | @@ -2037,14 +2045,7 @@ | ||
116 | eay_hmacmd5_one(key, data) | ||
117 | vchar_t *key, *data; | ||
118 | { | ||
119 | - vchar_t *res; | ||
120 | - caddr_t ctx; | ||
121 | - | ||
122 | - ctx = eay_hmacmd5_init(key); | ||
123 | - eay_hmacmd5_update(ctx, data); | ||
124 | - res = eay_hmacmd5_final(ctx); | ||
125 | - | ||
126 | - return(res); | ||
127 | + return eay_hmac_one(key, data, EVP_md5()); | ||
128 | } | ||
129 | |||
130 | caddr_t | ||
131 | @@ -2130,14 +2131,7 @@ | ||
132 | eay_sha2_512_one(data) | ||
133 | vchar_t *data; | ||
134 | { | ||
135 | - caddr_t ctx; | ||
136 | - vchar_t *res; | ||
137 | - | ||
138 | - ctx = eay_sha2_512_init(); | ||
139 | - eay_sha2_512_update(ctx, data); | ||
140 | - res = eay_sha2_512_final(ctx); | ||
141 | - | ||
142 | - return(res); | ||
143 | + return eay_digest_one(data, EVP_sha512()); | ||
144 | } | ||
145 | |||
146 | int | ||
147 | @@ -2190,14 +2184,7 @@ | ||
148 | eay_sha2_384_one(data) | ||
149 | vchar_t *data; | ||
150 | { | ||
151 | - caddr_t ctx; | ||
152 | - vchar_t *res; | ||
153 | - | ||
154 | - ctx = eay_sha2_384_init(); | ||
155 | - eay_sha2_384_update(ctx, data); | ||
156 | - res = eay_sha2_384_final(ctx); | ||
157 | - | ||
158 | - return(res); | ||
159 | + return eay_digest_one(data, EVP_sha2_384()); | ||
160 | } | ||
161 | |||
162 | int | ||
163 | @@ -2250,14 +2237,7 @@ | ||
164 | eay_sha2_256_one(data) | ||
165 | vchar_t *data; | ||
166 | { | ||
167 | - caddr_t ctx; | ||
168 | - vchar_t *res; | ||
169 | - | ||
170 | - ctx = eay_sha2_256_init(); | ||
171 | - eay_sha2_256_update(ctx, data); | ||
172 | - res = eay_sha2_256_final(ctx); | ||
173 | - | ||
174 | - return(res); | ||
175 | + return eay_digest_one(data, EVP_sha2_256()); | ||
176 | } | ||
177 | |||
178 | int | ||
179 | @@ -2309,14 +2289,7 @@ | ||
180 | eay_sha1_one(data) | ||
181 | vchar_t *data; | ||
182 | { | ||
183 | - caddr_t ctx; | ||
184 | - vchar_t *res; | ||
185 | - | ||
186 | - ctx = eay_sha1_init(); | ||
187 | - eay_sha1_update(ctx, data); | ||
188 | - res = eay_sha1_final(ctx); | ||
189 | - | ||
190 | - return(res); | ||
191 | + return eay_digest_one(data, EVP_sha1()); | ||
192 | } | ||
193 | |||
194 | int | ||
195 | @@ -2367,14 +2340,7 @@ | ||
196 | eay_md5_one(data) | ||
197 | vchar_t *data; | ||
198 | { | ||
199 | - caddr_t ctx; | ||
200 | - vchar_t *res; | ||
201 | - | ||
202 | - ctx = eay_md5_init(); | ||
203 | - eay_md5_update(ctx, data); | ||
204 | - res = eay_md5_final(ctx); | ||
205 | - | ||
206 | - return(res); | ||
207 | + return eay_digest_one(data, EVP_md5()); | ||
208 | } | ||
209 | |||
210 | int | ||
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index dc5fca1b55..7421b05d77 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=ipsec-tools | 2 | pkgname=ipsec-tools |
3 | pkgver=0.8_alpha20090903 | 3 | pkgver=0.8_alpha20101022 |
4 | _myver=0.8-alpha20090903 | 4 | _myver=0.8-alpha20101022 |
5 | pkgrel=11 | 5 | pkgrel=0 |
6 | pkgdesc="User-space IPsec tools for various IPsec implementations" | 6 | pkgdesc="User-space IPsec tools for various IPsec implementations" |
7 | url="http://ipsec-tools.sourceforge.net/" | 7 | url="http://ipsec-tools.sourceforge.net/" |
8 | license="BSD" | 8 | license="BSD" |
@@ -13,12 +13,9 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_myver.tar.gz | |||
13 | racoon.initd | 13 | racoon.initd |
14 | racoon.confd | 14 | racoon.confd |
15 | 50-reverse-connect.patch | 15 | 50-reverse-connect.patch |
16 | 60-debug-quick.patch | ||
17 | initial-contact-fix.diff | ||
18 | fd-priorities.patch | ||
19 | 70-rcvbuf-size.patch | 16 | 70-rcvbuf-size.patch |
20 | 75-racoonctl-rcvbuf.patch | 17 | 75-racoonctl-rcvbuf.patch |
21 | 90-openssl-oneshot.patch | 18 | 90-dpd-window-fix.patch |
22 | " | 19 | " |
23 | 20 | ||
24 | _builddir="$srcdir"/$pkgname-$_myver | 21 | _builddir="$srcdir"/$pkgname-$_myver |
@@ -28,7 +25,6 @@ prepare() { | |||
28 | msg "Applying $i..." | 25 | msg "Applying $i..." |
29 | patch -p1 -i $i || return 1 | 26 | patch -p1 -i $i || return 1 |
30 | done | 27 | done |
31 | patch -p0 -i "$srcdir"/initial-contact-fix.diff || return 1 | ||
32 | 28 | ||
33 | sed -i 's:-Werror::g' configure | 29 | sed -i 's:-Werror::g' configure |
34 | } | 30 | } |
@@ -59,13 +55,10 @@ package() { | |||
59 | install -D -m644 ../racoon.confd "$pkgdir"/etc/conf.d/racoon | 55 | install -D -m644 ../racoon.confd "$pkgdir"/etc/conf.d/racoon |
60 | } | 56 | } |
61 | 57 | ||
62 | md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd ipsec-tools-0.8-alpha20090903.tar.gz | 58 | md5sums="1492b83edc944b5d32d2eff51e33399e ipsec-tools-0.8-alpha20101022.tar.gz |
63 | 74f12ed04ed273a738229c0bfbf829cc racoon.initd | 59 | 74f12ed04ed273a738229c0bfbf829cc racoon.initd |
64 | 2d00250cf72da7f2f559c91b65a48747 racoon.confd | 60 | 2d00250cf72da7f2f559c91b65a48747 racoon.confd |
65 | 13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch | 61 | 13bda94a598aabf593280e04ea16065d 50-reverse-connect.patch |
66 | baa13d7f0f48955c792f7fcd42a8587a 60-debug-quick.patch | ||
67 | 69e06c5cc3a0c1cc8b10ddc89d1e644b initial-contact-fix.diff | ||
68 | c1e8b8dc80ef4b5d79fece52a4865e68 fd-priorities.patch | ||
69 | f40c78e4ca4b92d2bf74e4fcf3a8d91f 70-rcvbuf-size.patch | 62 | f40c78e4ca4b92d2bf74e4fcf3a8d91f 70-rcvbuf-size.patch |
70 | 2d5d24c4a3684a38584f88720f71c7d6 75-racoonctl-rcvbuf.patch | 63 | 2d5d24c4a3684a38584f88720f71c7d6 75-racoonctl-rcvbuf.patch |
71 | 11e2c21e443edab17725f74ffeaddb76 90-openssl-oneshot.patch" | 64 | 0391a6967ad19673588302bc8b17e0e2 90-dpd-window-fix.patch" |
diff --git a/main/ipsec-tools/fd-priorities.patch b/main/ipsec-tools/fd-priorities.patch deleted file mode 100644 index 68fc4b3455..0000000000 --- a/main/ipsec-tools/fd-priorities.patch +++ /dev/null | |||
@@ -1,285 +0,0 @@ | |||
1 | ? .msg | ||
2 | ? ChangeLog | ||
3 | ? alpine-config | ||
4 | ? commiters.txt | ||
5 | ? fd-priorities-2.patch | ||
6 | ? fd-priorities.patch | ||
7 | ? ipsec-tools-0.8-alpha20090820.tar.bz2 | ||
8 | ? ipsec-tools-0.8-alpha20090903.tar.bz2 | ||
9 | ? local-changes.diff | ||
10 | ? patch-to-support-cast128-cbc-algorithm.patch | ||
11 | ? racoon.txt | ||
12 | ? rpm/Makefile | ||
13 | ? rpm/Makefile.in | ||
14 | ? rpm/ipsec-tools.spec | ||
15 | ? rpm/suse/Makefile | ||
16 | ? rpm/suse/Makefile.in | ||
17 | ? rpm/suse/ipsec-tools.spec | ||
18 | ? src/Makefile | ||
19 | ? src/Makefile.in | ||
20 | ? src/include-glibc/.includes | ||
21 | ? src/include-glibc/Makefile | ||
22 | ? src/include-glibc/Makefile.in | ||
23 | ? src/libipsec/.deps | ||
24 | ? src/libipsec/.libs | ||
25 | ? src/libipsec/Makefile | ||
26 | ? src/libipsec/Makefile.in | ||
27 | ? src/libipsec/ipsec_dump_policy.lo | ||
28 | ? src/libipsec/ipsec_get_policylen.lo | ||
29 | ? src/libipsec/ipsec_strerror.lo | ||
30 | ? src/libipsec/key_debug.lo | ||
31 | ? src/libipsec/libipsec.la | ||
32 | ? src/libipsec/pfkey.lo | ||
33 | ? src/libipsec/pfkey_dump.lo | ||
34 | ? src/libipsec/policy_parse.c | ||
35 | ? src/libipsec/policy_parse.h | ||
36 | ? src/libipsec/policy_parse.lo | ||
37 | ? src/libipsec/policy_token.c | ||
38 | ? src/libipsec/policy_token.lo | ||
39 | ? src/racoon/.deps | ||
40 | ? src/racoon/.libs | ||
41 | ? src/racoon/Makefile | ||
42 | ? src/racoon/Makefile.in | ||
43 | ? src/racoon/cfparse.c | ||
44 | ? src/racoon/cfparse.h | ||
45 | ? src/racoon/cftoken.c | ||
46 | ? src/racoon/eaytest | ||
47 | ? src/racoon/libracoon.la | ||
48 | ? src/racoon/libracoon_la-kmpstat.lo | ||
49 | ? src/racoon/libracoon_la-misc.lo | ||
50 | ? src/racoon/libracoon_la-sockmisc.lo | ||
51 | ? src/racoon/libracoon_la-vmbuf.lo | ||
52 | ? src/racoon/plainrsa-gen | ||
53 | ? src/racoon/prsa_par.c | ||
54 | ? src/racoon/prsa_par.h | ||
55 | ? src/racoon/prsa_tok.c | ||
56 | ? src/racoon/racoon | ||
57 | ? src/racoon/racoonctl | ||
58 | ? src/racoon/samples/psk.txt | ||
59 | ? src/racoon/samples/racoon.conf | ||
60 | ? src/setkey/.deps | ||
61 | ? src/setkey/.libs | ||
62 | ? src/setkey/Makefile | ||
63 | ? src/setkey/Makefile.in | ||
64 | ? src/setkey/parse.c | ||
65 | ? src/setkey/parse.h | ||
66 | ? src/setkey/setkey | ||
67 | ? src/setkey/token.c | ||
68 | Index: src/racoon/admin.c | ||
69 | =================================================================== | ||
70 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/admin.c,v | ||
71 | retrieving revision 1.32 | ||
72 | diff -u -r1.32 admin.c | ||
73 | --- a/src/racoon/admin.c 3 Sep 2009 09:29:07 -0000 1.32 | ||
74 | +++ b/src/racoon/admin.c 9 Mar 2010 07:50:46 -0000 | ||
75 | @@ -734,7 +734,7 @@ | ||
76 | return -1; | ||
77 | } | ||
78 | |||
79 | - monitor_fd(lcconf->sock_admin, admin_handler, NULL); | ||
80 | + monitor_fd(lcconf->sock_admin, admin_handler, NULL, 0); | ||
81 | plog(LLV_DEBUG, LOCATION, NULL, | ||
82 | "open %s as racoon management.\n", sunaddr.sun_path); | ||
83 | |||
84 | Index: src/racoon/evt.c | ||
85 | =================================================================== | ||
86 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/evt.c,v | ||
87 | retrieving revision 1.9 | ||
88 | diff -u -r1.9 evt.c | ||
89 | --- a/src/racoon/evt.c 23 Jan 2009 08:05:58 -0000 1.9 | ||
90 | +++ b/src/racoon/evt.c 9 Mar 2010 07:50:46 -0000 | ||
91 | @@ -373,7 +373,7 @@ | ||
92 | |||
93 | LIST_INSERT_HEAD(list, l, ll_chain); | ||
94 | l->fd = fd; | ||
95 | - monitor_fd(l->fd, evt_unsubscribe_cb, l); | ||
96 | + monitor_fd(l->fd, evt_unsubscribe_cb, l, 0); | ||
97 | |||
98 | plog(LLV_DEBUG, LOCATION, NULL, | ||
99 | "[%d] admin connection is polling events\n", fd); | ||
100 | Index: src/racoon/grabmyaddr.c | ||
101 | =================================================================== | ||
102 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c,v | ||
103 | retrieving revision 1.23 | ||
104 | diff -u -r1.23 grabmyaddr.c | ||
105 | --- a/src/racoon/grabmyaddr.c 3 Jul 2009 06:41:46 -0000 1.23 | ||
106 | +++ b/src/racoon/grabmyaddr.c 9 Mar 2010 07:50:46 -0000 | ||
107 | @@ -296,7 +296,7 @@ | ||
108 | lcconf->rtsock = kernel_open_socket(); | ||
109 | if (lcconf->rtsock < 0) | ||
110 | return -1; | ||
111 | - monitor_fd(lcconf->rtsock, kernel_receive, NULL); | ||
112 | + monitor_fd(lcconf->rtsock, kernel_receive, NULL, 0); | ||
113 | } else { | ||
114 | lcconf->rtsock = -1; | ||
115 | if (!myaddr_open_all_configured(NULL)) | ||
116 | Index: src/racoon/isakmp.c | ||
117 | =================================================================== | ||
118 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp.c,v | ||
119 | retrieving revision 1.60 | ||
120 | diff -u -r1.60 isakmp.c | ||
121 | --- a/src/racoon/isakmp.c 3 Sep 2009 09:29:07 -0000 1.60 | ||
122 | +++ b/src/racoon/isakmp.c 9 Mar 2010 07:50:48 -0000 | ||
123 | @@ -1720,7 +1720,7 @@ | ||
124 | "%s used as isakmp port (fd=%d)\n", | ||
125 | saddr2str(addr), fd); | ||
126 | |||
127 | - monitor_fd(fd, isakmp_handler, NULL); | ||
128 | + monitor_fd(fd, isakmp_handler, NULL, 1); | ||
129 | return fd; | ||
130 | |||
131 | err: | ||
132 | Index: src/racoon/pfkey.c | ||
133 | =================================================================== | ||
134 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/pfkey.c,v | ||
135 | retrieving revision 1.52 | ||
136 | diff -u -r1.52 pfkey.c | ||
137 | --- a/src/racoon/pfkey.c 9 Feb 2010 23:05:16 -0000 1.52 | ||
138 | +++ b/src/racoon/pfkey.c 9 Mar 2010 07:50:49 -0000 | ||
139 | @@ -487,7 +487,7 @@ | ||
140 | return -1; | ||
141 | } | ||
142 | #endif | ||
143 | - monitor_fd(lcconf->sock_pfkey, pfkey_handler, NULL); | ||
144 | + monitor_fd(lcconf->sock_pfkey, pfkey_handler, NULL, 0); | ||
145 | return 0; | ||
146 | } | ||
147 | |||
148 | Index: src/racoon/session.c | ||
149 | =================================================================== | ||
150 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/session.c,v | ||
151 | retrieving revision 1.27 | ||
152 | diff -u -r1.27 session.c | ||
153 | --- a/src/racoon/session.c 4 Mar 2010 15:13:53 -0000 1.27 | ||
154 | +++ b/src/racoon/session.c 9 Mar 2010 07:50:50 -0000 | ||
155 | @@ -103,8 +103,13 @@ | ||
156 | struct fd_monitor { | ||
157 | int (*callback)(void *ctx, int fd); | ||
158 | void *ctx; | ||
159 | + int prio; | ||
160 | + int fd; | ||
161 | + TAILQ_ENTRY(fd_monitor) chain; | ||
162 | }; | ||
163 | |||
164 | +#define NUM_PRIORITIES 2 | ||
165 | + | ||
166 | static void close_session __P((void)); | ||
167 | static void initfds __P((void)); | ||
168 | static void init_signal __P((void)); | ||
169 | @@ -115,13 +120,14 @@ | ||
170 | |||
171 | static fd_set preset_mask, active_mask; | ||
172 | static struct fd_monitor fd_monitors[FD_SETSIZE]; | ||
173 | +static TAILQ_HEAD(fd_monitor_list, fd_monitor) fd_monitor_tree[NUM_PRIORITIES]; | ||
174 | static int nfds = 0; | ||
175 | |||
176 | static volatile sig_atomic_t sigreq[NSIG + 1]; | ||
177 | static struct sched scflushsa = SCHED_INITIALIZER(); | ||
178 | |||
179 | void | ||
180 | -monitor_fd(int fd, int (*callback)(void *, int), void *ctx) | ||
181 | +monitor_fd(int fd, int (*callback)(void *, int), void *ctx, int priority) | ||
182 | { | ||
183 | if (fd < 0 || fd >= FD_SETSIZE) { | ||
184 | plog(LLV_ERROR, LOCATION, NULL, "fd_set overrun"); | ||
185 | @@ -131,9 +137,17 @@ | ||
186 | FD_SET(fd, &preset_mask); | ||
187 | if (fd > nfds) | ||
188 | nfds = fd; | ||
189 | + if (priority <= 0) | ||
190 | + priority = 0; | ||
191 | + if (priority >= NUM_PRIORITIES) | ||
192 | + priority = NUM_PRIORITIES - 1; | ||
193 | |||
194 | fd_monitors[fd].callback = callback; | ||
195 | fd_monitors[fd].ctx = ctx; | ||
196 | + fd_monitors[fd].prio = priority; | ||
197 | + fd_monitors[fd].fd = fd; | ||
198 | + TAILQ_INSERT_TAIL(&fd_monitor_tree[priority], | ||
199 | + &fd_monitors[fd], chain); | ||
200 | } | ||
201 | |||
202 | void | ||
203 | @@ -144,10 +158,15 @@ | ||
204 | exit(1); | ||
205 | } | ||
206 | |||
207 | + if (fd_monitors[fd].callback == NULL) | ||
208 | + return; | ||
209 | + | ||
210 | FD_CLR(fd, &preset_mask); | ||
211 | FD_CLR(fd, &active_mask); | ||
212 | fd_monitors[fd].callback = NULL; | ||
213 | fd_monitors[fd].ctx = NULL; | ||
214 | + TAILQ_REMOVE(&fd_monitor_tree[fd_monitors[fd].prio], | ||
215 | + &fd_monitors[fd], chain); | ||
216 | } | ||
217 | |||
218 | int | ||
219 | @@ -158,11 +177,15 @@ | ||
220 | char pid_file[MAXPATHLEN]; | ||
221 | FILE *fp; | ||
222 | pid_t racoon_pid = 0; | ||
223 | - int i; | ||
224 | + int i, count; | ||
225 | + struct fd_monitor *fdm; | ||
226 | |||
227 | nfds = 0; | ||
228 | FD_ZERO(&preset_mask); | ||
229 | |||
230 | + for (i = 0; i < NUM_PRIORITIES; i++) | ||
231 | + TAILQ_INIT(&fd_monitor_tree[i]); | ||
232 | + | ||
233 | /* initialize schedular */ | ||
234 | sched_init(); | ||
235 | init_signal(); | ||
236 | @@ -291,16 +314,24 @@ | ||
237 | /*NOTREACHED*/ | ||
238 | } | ||
239 | |||
240 | - for (i = 0; i <= nfds; i++) { | ||
241 | - if (!FD_ISSET(i, &active_mask)) | ||
242 | - continue; | ||
243 | - | ||
244 | - if (fd_monitors[i].callback != NULL) | ||
245 | - fd_monitors[i].callback(fd_monitors[i].ctx, i); | ||
246 | - else | ||
247 | - plog(LLV_ERROR, LOCATION, NULL, | ||
248 | - "fd %d set, but no active callback\n", i); | ||
249 | + count = 0; | ||
250 | + for (i = 0; i < NUM_PRIORITIES; i++) { | ||
251 | + TAILQ_FOREACH(fdm, &fd_monitor_tree[i], chain) { | ||
252 | + if (!FD_ISSET(fdm->fd, &active_mask)) | ||
253 | + continue; | ||
254 | + | ||
255 | + FD_CLR(fdm->fd, &active_mask); | ||
256 | + if (fdm->callback != NULL) { | ||
257 | + fdm->callback(fdm->ctx, fdm->fd); | ||
258 | + count++; | ||
259 | + } else | ||
260 | + plog(LLV_ERROR, LOCATION, NULL, | ||
261 | + "fd %d set, but no active callback\n", i); | ||
262 | + } | ||
263 | + if (count != 0) | ||
264 | + break; | ||
265 | } | ||
266 | + | ||
267 | } | ||
268 | } | ||
269 | |||
270 | Index: src/racoon/session.h | ||
271 | =================================================================== | ||
272 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/session.h,v | ||
273 | retrieving revision 1.8 | ||
274 | diff -u -r1.8 session.h | ||
275 | --- a/src/racoon/session.h 23 Jan 2009 08:05:58 -0000 1.8 | ||
276 | +++ b/src/racoon/session.h 9 Mar 2010 07:50:50 -0000 | ||
277 | @@ -37,7 +37,7 @@ | ||
278 | extern int session __P((void)); | ||
279 | extern RETSIGTYPE signal_handler __P((int)); | ||
280 | |||
281 | -extern void monitor_fd __P((int fd, int (*callback)(void *, int), void *ctx)); | ||
282 | +extern void monitor_fd __P((int fd, int (*callback)(void *, int), void *ctx, int priority)); | ||
283 | extern void unmonitor_fd __P((int fd)); | ||
284 | |||
285 | #endif /* _SESSION_H */ | ||
diff --git a/main/ipsec-tools/initial-contact-fix.diff b/main/ipsec-tools/initial-contact-fix.diff deleted file mode 100644 index 370418be09..0000000000 --- a/main/ipsec-tools/initial-contact-fix.diff +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | Index: src/racoon/admin.c | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/admin.c,v | ||
4 | retrieving revision 1.32 | ||
5 | diff -u -r1.32 admin.c | ||
6 | --- src/racoon/admin.c 3 Sep 2009 09:29:07 -0000 1.32 | ||
7 | +++ src/racoon/admin.c 10 Dec 2009 14:38:47 -0000 | ||
8 | @@ -299,9 +299,8 @@ | ||
9 | break; | ||
10 | |||
11 | case ADMIN_DELETE_SA: { | ||
12 | - struct ph1handle *iph1; | ||
13 | - struct ph1selector sel; | ||
14 | char *loc, *rem; | ||
15 | + struct ph1selector sel; | ||
16 | |||
17 | memset(&sel, 0, sizeof(sel)); | ||
18 | sel.local = (struct sockaddr *) | ||
19 | @@ -319,6 +318,7 @@ | ||
20 | plog(LLV_INFO, LOCATION, NULL, | ||
21 | "admin delete-sa %s %s\n", loc, rem); | ||
22 | enumph1(&sel, admin_ph1_delete_sa, NULL); | ||
23 | + remcontacted(sel.remote); | ||
24 | |||
25 | racoon_free(loc); | ||
26 | racoon_free(rem); | ||
27 | Index: src/racoon/handler.c | ||
28 | =================================================================== | ||
29 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.c,v | ||
30 | retrieving revision 1.31 | ||
31 | diff -u -r1.31 handler.c | ||
32 | --- src/racoon/handler.c 22 Nov 2009 19:34:55 -0000 1.31 | ||
33 | +++ src/racoon/handler.c 10 Dec 2009 14:38:48 -0000 | ||
34 | @@ -966,6 +966,22 @@ | ||
35 | } | ||
36 | |||
37 | void | ||
38 | +remcontacted(remote) | ||
39 | + struct sockaddr *remote; | ||
40 | +{ | ||
41 | + struct contacted *p; | ||
42 | + | ||
43 | + LIST_FOREACH(p, &ctdtree, chain) { | ||
44 | + if (cmpsaddr(remote, p->remote) == 0) { | ||
45 | + LIST_REMOVE(p, chain); | ||
46 | + racoon_free(p->remote); | ||
47 | + racoon_free(p); | ||
48 | + break; | ||
49 | + } | ||
50 | + } | ||
51 | +} | ||
52 | + | ||
53 | +void | ||
54 | initctdtree() | ||
55 | { | ||
56 | LIST_INIT(&ctdtree); | ||
57 | Index: src/racoon/handler.h | ||
58 | =================================================================== | ||
59 | RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v | ||
60 | retrieving revision 1.22 | ||
61 | diff -u -r1.22 handler.h | ||
62 | --- src/racoon/handler.h 3 Sep 2009 09:29:07 -0000 1.22 | ||
63 | +++ src/racoon/handler.h 10 Dec 2009 14:38:48 -0000 | ||
64 | @@ -518,6 +518,7 @@ | ||
65 | |||
66 | extern struct contacted *getcontacted __P((struct sockaddr *)); | ||
67 | extern int inscontacted __P((struct sockaddr *)); | ||
68 | +extern void remcontacted __P((struct sockaddr *)); | ||
69 | extern void initctdtree __P((void)); | ||
70 | |||
71 | extern int check_recvdpkt __P((struct sockaddr *, | ||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 84665e374a..a144f1f351 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.35.7 | 5 | pkgver=2.6.35.7 |
6 | _kernver=2.6.35 | 6 | _kernver=2.6.35 |
7 | pkgrel=2 | 7 | pkgrel=3 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -145,4 +145,4 @@ md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 | |||
145 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch | 145 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch |
146 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch | 146 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch |
147 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch | 147 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch |
148 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" | 148 | 16d6b950b8c8d9c9e6b43eb76cd090f4 kernelconfig.x86" |
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index a8abd7f623..750db81bb5 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.35.7 | 3 | # Linux kernel version: 2.6.35.7 |
4 | # Tue Oct 26 10:47:49 2010 | 4 | # Wed Oct 27 08:38:30 2010 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -4265,9 +4265,7 @@ CONFIG_STAGING=y | |||
4265 | # CONFIG_IDE_PHISON is not set | 4265 | # CONFIG_IDE_PHISON is not set |
4266 | # CONFIG_LINE6_USB is not set | 4266 | # CONFIG_LINE6_USB is not set |
4267 | # CONFIG_DRM_VMWGFX is not set | 4267 | # CONFIG_DRM_VMWGFX is not set |
4268 | CONFIG_DRM_NOUVEAU=m | 4268 | # CONFIG_DRM_NOUVEAU is not set |
4269 | CONFIG_DRM_NOUVEAU_BACKLIGHT=y | ||
4270 | CONFIG_DRM_NOUVEAU_DEBUG=y | ||
4271 | 4269 | ||
4272 | # | 4270 | # |
4273 | # I2C encoder or helper chips | 4271 | # I2C encoder or helper chips |
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 1f13737855..a6c8bbba18 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD | |||
@@ -5,7 +5,7 @@ pkgname=linux-${_flavor} | |||
5 | pkgver=2.6.35.7 | 5 | pkgver=2.6.35.7 |
6 | 6 | ||
7 | _kernver=2.6.35 | 7 | _kernver=2.6.35 |
8 | pkgrel=0 | 8 | pkgrel=1 |
9 | pkgdesc="Linux kernel with vserver" | 9 | pkgdesc="Linux kernel with vserver" |
10 | url="http://linux-vserver.org/" | 10 | url="http://linux-vserver.org/" |
11 | depends="mkinitfs linux-firmware" | 11 | depends="mkinitfs linux-firmware" |
@@ -16,6 +16,7 @@ install= | |||
16 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | 16 | source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 |
17 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 | 17 | ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 |
18 | http://vserver.13thfloor.at/Experimental/patch-2.6.35.7-vs2.3.0.36.33.diff | 18 | http://vserver.13thfloor.at/Experimental/patch-2.6.35.7-vs2.3.0.36.33.diff |
19 | setlocalversion.patch | ||
19 | kernelconfig.x86 | 20 | kernelconfig.x86 |
20 | " | 21 | " |
21 | subpackages="$pkgname-dev" | 22 | subpackages="$pkgname-dev" |
@@ -35,7 +36,7 @@ prepare() { | |||
35 | case $i in | 36 | case $i in |
36 | *.patch|*.diff) | 37 | *.patch|*.diff) |
37 | msg "Applying $i..." | 38 | msg "Applying $i..." |
38 | patch -s -p1 -N < "$srcdir"/$i || return 1 | 39 | patch -s -p1 -i "$srcdir"/$i || return 1 |
39 | ;; | 40 | ;; |
40 | esac | 41 | esac |
41 | done | 42 | done |
@@ -125,4 +126,5 @@ dev() { | |||
125 | md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 | 126 | md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 |
126 | 6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2 | 127 | 6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2 |
127 | 87f2232a85a8e5542c7933f2614d3622 patch-2.6.35.7-vs2.3.0.36.33.diff | 128 | 87f2232a85a8e5542c7933f2614d3622 patch-2.6.35.7-vs2.3.0.36.33.diff |
129 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch | ||
128 | 10b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86" | 130 | 10b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86" |
diff --git a/main/linux-vserver/setlocalversion.patch b/main/linux-vserver/setlocalversion.patch new file mode 100644 index 0000000000..d82eb170ab --- /dev/null +++ b/main/linux-vserver/setlocalversion.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- ./scripts/setlocalversion.orig | ||
2 | +++ ./scripts/setlocalversion | ||
3 | @@ -43,7 +43,7 @@ | ||
4 | fi | ||
5 | |||
6 | # Check for git and a git repo. | ||
7 | - if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | ||
8 | + if [ -d "$srctree"/.git ] && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | ||
9 | |||
10 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore | ||
11 | # it, because this version is defined in the top level Makefile. | ||
diff --git a/testing/lua-filesystem/APKBUILD b/main/lua-filesystem/APKBUILD index 4c6d6d7b15..2864086990 100644 --- a/testing/lua-filesystem/APKBUILD +++ b/main/lua-filesystem/APKBUILD | |||
@@ -1,8 +1,7 @@ | |||
1 | # Contributor: | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: | ||
3 | pkgname=lua-filesystem | 2 | pkgname=lua-filesystem |
4 | pkgver=1.4.2 | 3 | pkgver=1.5.0 |
5 | pkgrel=1 | 4 | pkgrel=0 |
6 | pkgdesc="Lua library to complement the set of functions related to file systems" | 5 | pkgdesc="Lua library to complement the set of functions related to file systems" |
7 | url="http://www.keplerproject.org/luafilesystem/" | 6 | url="http://www.keplerproject.org/luafilesystem/" |
8 | license="GPL" | 7 | license="GPL" |
@@ -10,7 +9,7 @@ depends= | |||
10 | makedepends="lua-dev" | 9 | makedepends="lua-dev" |
11 | install= | 10 | install= |
12 | subpackages= | 11 | subpackages= |
13 | source="http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz" | 12 | source="http://github.com/downloads/keplerproject/luafilesystem/luafilesystem-$pkgver.tar.gz" |
14 | 13 | ||
15 | _builddir="$srcdir"/luafilesystem-$pkgver | 14 | _builddir="$srcdir"/luafilesystem-$pkgver |
16 | prepare() { | 15 | prepare() { |
@@ -28,4 +27,4 @@ package() { | |||
28 | make LUA_LIBDIR="$pkgdir"/usr/lib/lua/5.1 install | 27 | make LUA_LIBDIR="$pkgdir"/usr/lib/lua/5.1 install |
29 | } | 28 | } |
30 | 29 | ||
31 | md5sums="8e7b2a9b899d669280456d0f95afd961 luafilesystem-1.4.2.tar.gz" | 30 | md5sums="3cf4882bbce956e7a0b010f148f194a3 luafilesystem-1.5.0.tar.gz" |
diff --git a/testing/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD index 56980fb3ba..48895c2b0b 100644 --- a/testing/lua-penlight/APKBUILD +++ b/main/lua-penlight/APKBUILD | |||
@@ -1,5 +1,4 @@ | |||
1 | # Contributor: | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: | ||
3 | pkgname=lua-penlight | 2 | pkgname=lua-penlight |
4 | pkgver=0.7.2 | 3 | pkgver=0.7.2 |
5 | pkgrel=0 | 4 | pkgrel=0 |
@@ -12,10 +11,6 @@ install= | |||
12 | subpackages="$pkgname-doc" | 11 | subpackages="$pkgname-doc" |
13 | source="http://luaforge.net/frs/download.php/4091/pl.0.7.2.zip" | 12 | source="http://luaforge.net/frs/download.php/4091/pl.0.7.2.zip" |
14 | 13 | ||
15 | # append extra dependencies to -dev subpackage | ||
16 | # remove if not used. | ||
17 | # depends_dev="somepackage-dev" | ||
18 | |||
19 | _builddir="$srcdir" | 14 | _builddir="$srcdir" |
20 | 15 | ||
21 | build() { | 16 | build() { |
diff --git a/testing/lua-xctrl/APKBUILD b/main/lua-xctrl/APKBUILD index 509cd7bec1..92871e548c 100644 --- a/testing/lua-xctrl/APKBUILD +++ b/main/lua-xctrl/APKBUILD | |||
@@ -1,7 +1,6 @@ | |||
1 | # Contributor: | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: | ||
3 | pkgname=lua-xctrl | 2 | pkgname=lua-xctrl |
4 | pkgver=2010.10.22 | 3 | pkgver=2010.10.26 |
5 | _x=${pkgver%%.*} | 4 | _x=${pkgver%%.*} |
6 | _y=${pkgver%.*} | 5 | _y=${pkgver%.*} |
7 | _y=${_y#*.} | 6 | _y=${_y#*.} |
@@ -34,7 +33,7 @@ package() { | |||
34 | cd "$_builddir" | 33 | cd "$_builddir" |
35 | install -d "$pkgdir"/$_lua_libdir "$pkgdir"/usr/share/doc/$pkgname | 34 | install -d "$pkgdir"/$_lua_libdir "$pkgdir"/usr/share/doc/$pkgname |
36 | install src/xctrl.so "$pkgdir"/$_lua_libdir/xctrl.so | 35 | install src/xctrl.so "$pkgdir"/$_lua_libdir/xctrl.so |
37 | install doc/lwmctrl.html "$pkgdir"/usr/share/doc/$pkgname/lwmctrl.html | 36 | install doc/lxctrl.html "$pkgdir"/usr/share/doc/$pkgname/lxctrl.html |
38 | } | 37 | } |
39 | 38 | ||
40 | md5sums="8a234fb4fc143407a4a7788882665e49 xctrl-2010-10-22.tar.gz" | 39 | md5sums="edbe3385f1a660d1419d2d896c8cf106 xctrl-2010-10-26.tar.gz" |
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD index 26cb1371ad..dc25231dc3 100644 --- a/main/mplayer/APKBUILD +++ b/main/mplayer/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | pkgname=mplayer | 2 | pkgname=mplayer |
3 | pkgver=1.0_rc4_p20100612 | 3 | pkgver=1.0_rc4_p20100612 |
4 | _svnver=SVN-r30554 | 4 | _svnver=SVN-r30554 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="A movie player for linux" | 6 | pkgdesc="A movie player for linux" |
7 | url="http://www.mplayerhq.hu/" | 7 | url="http://www.mplayerhq.hu/" |
8 | license="GPL" | 8 | license="GPL" |
diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD index 2e65b7a2cc..e445576d8c 100644 --- a/main/remmina/APKBUILD +++ b/main/remmina/APKBUILD | |||
@@ -1,7 +1,6 @@ | |||
1 | # Contributor: | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | # Maintainer: | ||
3 | pkgname=remmina | 2 | pkgname=remmina |
4 | pkgver=0.8.2 | 3 | pkgver=0.8.3 |
5 | pkgrel=0 | 4 | pkgrel=0 |
6 | pkgdesc="Remmina is a remote desktop client written in GTK+" | 5 | pkgdesc="Remmina is a remote desktop client written in GTK+" |
7 | url="http://remmina.sourceforge.net/" | 6 | url="http://remmina.sourceforge.net/" |
@@ -13,15 +12,10 @@ install= | |||
13 | subpackages= | 12 | subpackages= |
14 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" | 13 | source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" |
15 | 14 | ||
16 | # append extra dependencies to -dev subpackage | ||
17 | # remove if not used. | ||
18 | # depends_dev="somepackage-dev" | ||
19 | |||
20 | _builddir="$srcdir"/$pkgname-$pkgver | 15 | _builddir="$srcdir"/$pkgname-$pkgver |
21 | 16 | ||
22 | prepare() { | 17 | prepare() { |
23 | cd "$_builddir" | 18 | cd "$_builddir" |
24 | # apply patches here | ||
25 | } | 19 | } |
26 | 20 | ||
27 | build() { | 21 | build() { |
@@ -36,10 +30,6 @@ build() { | |||
36 | package() { | 30 | package() { |
37 | cd "$_builddir" | 31 | cd "$_builddir" |
38 | make DESTDIR="$pkgdir" install | 32 | make DESTDIR="$pkgdir" install |
39 | |||
40 | # remove the 2 lines below (and this) if there is no init.d script | ||
41 | # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
42 | # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | ||
43 | } | 33 | } |
44 | 34 | ||
45 | md5sums="003e072217219113e2eb0d3bb18c568c remmina-0.8.2.tar.gz" | 35 | md5sums="b4c6830eb6ee5794bd1ca549fb918d16 remmina-0.8.3.tar.gz" |
diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD index 994adaef43..34120b91b7 100644 --- a/main/tar/APKBUILD +++ b/main/tar/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Carlo Landmeter <clandmeter at gmail.com> | 1 | # Maintainer: Carlo Landmeter <clandmeter at gmail.com> |
2 | pkgname=tar | 2 | pkgname=tar |
3 | pkgver=1.23 | 3 | pkgver=1.24 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Utility used to store, backup, and transport files" | 5 | pkgdesc="Utility used to store, backup, and transport files" |
6 | url="http://www.gnu.org" | 6 | url="http://www.gnu.org" |
7 | license='GPL' | 7 | license='GPL' |
@@ -27,4 +27,4 @@ package() { | |||
27 | ln -s /bin/tar "$pkgdir"/usr/bin/tar | 27 | ln -s /bin/tar "$pkgdir"/usr/bin/tar |
28 | } | 28 | } |
29 | 29 | ||
30 | md5sums="fe81d950b61cb2f45619e1fcef97ce60 tar-1.23.tar.gz" | 30 | md5sums="6f84e44a332449844995874cf5245094 tar-1.24.tar.gz" |
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index c83c49571a..ae0b14bd55 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=vlc | 2 | pkgname=vlc |
3 | pkgver=1.1.4.1 | 3 | pkgver=1.1.4.1 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" | 5 | pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" |
6 | url="http://www.videolan.org/vlc/" | 6 | url="http://www.videolan.org/vlc/" |
7 | license="GPL-2" | 7 | license="GPL-2" |
diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD index b6d0a61289..312913508c 100644 --- a/main/x264/APKBUILD +++ b/main/x264/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=x264 | 2 | pkgname=x264 |
3 | pkgver=20100607 | 3 | pkgver=20101013 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="free library for encoding H264/AVC video streams" | 5 | pkgdesc="free library for encoding H264/AVC video streams" |
6 | url="http://www.videolan.org/developers/x264.html" | 6 | url="http://www.videolan.org/developers/x264.html" |
@@ -26,4 +26,4 @@ package() { | |||
26 | cd "$_builddir" | 26 | cd "$_builddir" |
27 | make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 | 27 | make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 |
28 | } | 28 | } |
29 | md5sums="d796cbb3eb4ce5126b861aed64d0058e x264-snapshot-20100607-2245.tar.bz2" | 29 | md5sums="332def30b4c8ba2d4ef307396a354c19 x264-snapshot-20101013-2245.tar.bz2" |