| 1 |
dev-zero 14/06/25 06:48:01 |
| 2 |
|
| 3 |
Added: ossp-uuid-1.6.2-hwaddr.patch |
| 4 |
ossp-uuid-1.6.2-manfix.patch |
| 5 |
ossp-uuid-1.6.2-fix-whatis-entries.patch |
| 6 |
ossp-uuid-1.6.2-fix-data-uuid-from-string.patch |
| 7 |
ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch |
| 8 |
Removed: ossp-uuid-1.6.2-gentoo.patch |
| 9 |
Log: |
| 10 |
Also build for php-5.5 (bug #491852), add various bug-fixes from Fedora and Ubuntu/Debian, fix Perl-bindings installation. |
| 11 |
|
| 12 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-hwaddr.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: ossp-uuid-1.6.2-hwaddr.patch |
| 21 |
=================================================================== |
| 22 |
diff -urN uuid-1.6.2/configure uuid-1.6.2/configure |
| 23 |
--- uuid-1.6.2/configure 2008-07-04 15:43:09.000000000 -0600 |
| 24 |
+++ uuid-1.6.2/configure 2012-06-06 19:19:41.659880386 -0600 |
| 25 |
@@ -14208,7 +14208,7 @@ |
| 26 |
|
| 27 |
|
| 28 |
|
| 29 |
-for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h |
| 30 |
+for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h |
| 31 |
do |
| 32 |
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 33 |
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 34 |
diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c |
| 35 |
--- uuid-1.6.2/uuid.c 2008-03-07 03:49:59.000000000 -0700 |
| 36 |
+++ uuid-1.6.2/uuid.c 2012-06-06 15:50:30.060881473 -0600 |
| 37 |
@@ -72,6 +72,8 @@ |
| 38 |
/* IEEE 802 MAC address octet length */ |
| 39 |
#define IEEE_MAC_OCTETS 6 |
| 40 |
|
| 41 |
+static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00}; |
| 42 |
+ |
| 43 |
/* UUID binary representation according to UUID standards */ |
| 44 |
typedef struct { |
| 45 |
uuid_uint32_t time_low; /* bits 0-31 of time field */ |
| 46 |
@@ -967,7 +969,7 @@ |
| 47 |
* GENERATE NODE |
| 48 |
*/ |
| 49 |
|
| 50 |
- if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) { |
| 51 |
+ if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) { |
| 52 |
/* generate random IEEE 802 local multicast MAC address */ |
| 53 |
if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK) |
| 54 |
return UUID_RC_INT; |
| 55 |
diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c |
| 56 |
--- uuid-1.6.2/uuid_mac.c 2008-03-07 03:49:59.000000000 -0700 |
| 57 |
+++ uuid-1.6.2/uuid_mac.c 2012-06-06 19:30:49.050879930 -0600 |
| 58 |
@@ -76,6 +76,9 @@ |
| 59 |
#ifdef HAVE_IFADDRS_H |
| 60 |
#include <ifaddrs.h> |
| 61 |
#endif |
| 62 |
+#ifdef HAVE_NETPACKET_PACKET_H |
| 63 |
+#include <netpacket/packet.h> |
| 64 |
+#endif |
| 65 |
|
| 66 |
/* own headers (part (1/2) */ |
| 67 |
#include "uuid_mac.h" |
| 68 |
@@ -87,6 +90,10 @@ |
| 69 |
#define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/) |
| 70 |
#endif |
| 71 |
|
| 72 |
+#if !defined(min) |
| 73 |
+#define min(a,b) ((a) < (b) ? (a) : (b)) |
| 74 |
+#endif |
| 75 |
+ |
| 76 |
/* return the Media Access Control (MAC) address of |
| 77 |
the FIRST network interface card (NIC) */ |
| 78 |
int mac_address(unsigned char *data_ptr, size_t data_len) |
| 79 |
@@ -95,28 +102,41 @@ |
| 80 |
if (data_ptr == NULL || data_len < MAC_LEN) |
| 81 |
return FALSE; |
| 82 |
|
| 83 |
-#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS) |
| 84 |
+#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS) |
| 85 |
/* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */ |
| 86 |
{ |
| 87 |
struct ifaddrs *ifap; |
| 88 |
struct ifaddrs *ifap_head; |
| 89 |
+#if defined(HAVE_NET_IF_DL_H) |
| 90 |
const struct sockaddr_dl *sdl; |
| 91 |
unsigned char *ucp; |
| 92 |
- int i; |
| 93 |
+#else |
| 94 |
+ const struct sockaddr_ll *sll; |
| 95 |
+#endif |
| 96 |
|
| 97 |
if (getifaddrs(&ifap_head) < 0) |
| 98 |
return FALSE; |
| 99 |
for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) { |
| 100 |
+#if defined(HAVE_NET_IF_DL_H) |
| 101 |
if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) { |
| 102 |
sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr; |
| 103 |
ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen); |
| 104 |
if (sdl->sdl_alen > 0) { |
| 105 |
- for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++) |
| 106 |
- data_ptr[i] = (unsigned char)(*ucp & 0xff); |
| 107 |
+ memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN)); |
| 108 |
freeifaddrs(ifap_head); |
| 109 |
return TRUE; |
| 110 |
} |
| 111 |
} |
| 112 |
+#else |
| 113 |
+ if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) { |
| 114 |
+ sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr; |
| 115 |
+ if (sll->sll_hatype == ARPHRD_ETHER) { |
| 116 |
+ memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN)); |
| 117 |
+ freeifaddrs(ifap_head); |
| 118 |
+ return TRUE; |
| 119 |
+ } |
| 120 |
+ } |
| 121 |
+#endif |
| 122 |
} |
| 123 |
freeifaddrs(ifap_head); |
| 124 |
} |
| 125 |
diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in |
| 126 |
--- uuid-1.6.2/config.h.in 2008-07-04 15:43:10.000000000 -0600 |
| 127 |
+++ uuid-1.6.2/config.h.in 2012-06-06 21:59:03.370227352 -0600 |
| 128 |
@@ -75,6 +75,9 @@ |
| 129 |
/* Define to 1 if you have the <netinet/in.h> header file. */ |
| 130 |
#undef HAVE_NETINET_IN_H |
| 131 |
|
| 132 |
+/* Define to 1 if you have the <netpacket/packet.h> header file. */ |
| 133 |
+#undef HAVE_NETPACKET_PACKET_H |
| 134 |
+ |
| 135 |
/* Define to 1 if you have the <net/if_arp.h> header file. */ |
| 136 |
#undef HAVE_NET_IF_ARP_H |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
|
| 141 |
1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch |
| 142 |
|
| 143 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch?rev=1.1&view=markup |
| 144 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-manfix.patch?rev=1.1&content-type=text/plain |
| 145 |
|
| 146 |
Index: ossp-uuid-1.6.2-manfix.patch |
| 147 |
=================================================================== |
| 148 |
diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1 |
| 149 |
--- uuid-1.6.2/uuid.1.manfix 2013-05-30 15:56:38.630003125 +0200 |
| 150 |
+++ uuid-1.6.2/uuid.1 2013-05-30 16:00:57.145127756 +0200 |
| 151 |
@@ -238,6 +238,9 @@ value representation of a \s-1UUID\s0. E |
| 152 |
.IP "\fB\-o\fR \fIfilename\fR" 3 |
| 153 |
.IX Item "-o filename" |
| 154 |
Write output to \fIfilename\fR instead of to \fIstdout\fR. |
| 155 |
+.IP "\fB\-r\fR" 3 |
| 156 |
+.IX Item "-r" |
| 157 |
+This is equivalent to \fB-F BIN\fR. |
| 158 |
.IP "\fB\-d\fR" 3 |
| 159 |
.IX Item "-d" |
| 160 |
Decode a given \s-1UUID\s0 (given as a command line argument or if the command |
| 161 |
|
| 162 |
|
| 163 |
|
| 164 |
1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch |
| 165 |
|
| 166 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch?rev=1.1&view=markup |
| 167 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-whatis-entries.patch?rev=1.1&content-type=text/plain |
| 168 |
|
| 169 |
Index: ossp-uuid-1.6.2-fix-whatis-entries.patch |
| 170 |
=================================================================== |
| 171 |
From: Marco Nenciarini <marco.nenciarini@××××××.it> |
| 172 |
Date: Tue, 2 Feb 2010 12:16:49 +0100 |
| 173 |
Subject: [PATCH] Fix whatis entries |
| 174 |
|
| 175 |
Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages |
| 176 |
--- |
| 177 |
uuid++.pod | 2 +- |
| 178 |
uuid.pod | 2 +- |
| 179 |
uuid_cli.pod | 2 +- |
| 180 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 181 |
|
| 182 |
diff --git a/uuid++.pod b/uuid++.pod |
| 183 |
index 8b5a4b1..89c5efb 100644 |
| 184 |
--- a/uuid++.pod |
| 185 |
+++ b/uuid++.pod |
| 186 |
@@ -31,7 +31,7 @@ |
| 187 |
|
| 188 |
=head1 NAME |
| 189 |
|
| 190 |
-B<OSSP uuid> - B<Universally Unique Identifier> (C++ API) |
| 191 |
+B<uuid++> - B<Universally Unique Identifier> (C++ API) |
| 192 |
|
| 193 |
=head1 VERSION |
| 194 |
|
| 195 |
diff --git a/uuid.pod b/uuid.pod |
| 196 |
index 4ad3742..0179a46 100644 |
| 197 |
--- a/uuid.pod |
| 198 |
+++ b/uuid.pod |
| 199 |
@@ -31,7 +31,7 @@ |
| 200 |
|
| 201 |
=head1 NAME |
| 202 |
|
| 203 |
-B<OSSP uuid> - B<Universally Unique Identifier> |
| 204 |
+B<uuid> - B<Universally Unique Identifier> |
| 205 |
|
| 206 |
=head1 VERSION |
| 207 |
|
| 208 |
diff --git a/uuid_cli.pod b/uuid_cli.pod |
| 209 |
index ddec6bb..df9dc83 100644 |
| 210 |
--- a/uuid_cli.pod |
| 211 |
+++ b/uuid_cli.pod |
| 212 |
@@ -31,7 +31,7 @@ |
| 213 |
|
| 214 |
=head1 NAME |
| 215 |
|
| 216 |
-B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool> |
| 217 |
+B<uuid> - B<Universally Unique Identifier Command-Line Tool> |
| 218 |
|
| 219 |
=head1 VERSION |
| 220 |
|
| 221 |
-- |
| 222 |
|
| 223 |
|
| 224 |
|
| 225 |
1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch |
| 226 |
|
| 227 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch?rev=1.1&view=markup |
| 228 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-fix-data-uuid-from-string.patch?rev=1.1&content-type=text/plain |
| 229 |
|
| 230 |
Index: ossp-uuid-1.6.2-fix-data-uuid-from-string.patch |
| 231 |
=================================================================== |
| 232 |
Description: Support dash-less args to from_string. |
| 233 |
Author: Tim Retout <diocles@××××××.org> |
| 234 |
Bug-Debian: http://bugs.debian.org/635607 |
| 235 |
|
| 236 |
The module Data::GUID depends on Data::UUID supporting this behaviour. |
| 237 |
|
| 238 |
--- a/perl/uuid_compat.pm |
| 239 |
+++ b/perl/uuid_compat.pm |
| 240 |
@@ -93,7 +93,9 @@ |
| 241 |
$uuid->import('str', |
| 242 |
$str =~ /^0x/ |
| 243 |
? join '-', unpack('x2 a8 a4 a4 a4 a12', $str) |
| 244 |
- : $str |
| 245 |
+ : $str =~ /-/ |
| 246 |
+ ? $str |
| 247 |
+ : join '-', unpack('A8 A4 A4 A4 A12', $str) |
| 248 |
); |
| 249 |
return $uuid->export('bin'); |
| 250 |
} |
| 251 |
--- a/perl/uuid_compat.ts |
| 252 |
+++ b/perl/uuid_compat.ts |
| 253 |
@@ -28,7 +28,7 @@ |
| 254 |
## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part) |
| 255 |
## |
| 256 |
|
| 257 |
-use Test::More tests => 14; |
| 258 |
+use Test::More tests => 16; |
| 259 |
|
| 260 |
BEGIN { |
| 261 |
use_ok('Data::UUID'); |
| 262 |
@@ -53,3 +53,5 @@ |
| 263 |
ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8")); |
| 264 |
ok($ug->compare($uuid7, $uuid8) == 0); |
| 265 |
|
| 266 |
+ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8")); |
| 267 |
+ok($ug->compare($uuid7, $uuid9) == 0); |
| 268 |
|
| 269 |
|
| 270 |
|
| 271 |
1.1 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch |
| 272 |
|
| 273 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch?rev=1.1&view=markup |
| 274 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch?rev=1.1&content-type=text/plain |
| 275 |
|
| 276 |
Index: ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch |
| 277 |
=================================================================== |
| 278 |
From: Marco Nenciarini <marco.nenciarini@××××××.it> |
| 279 |
Date: Wed, 27 Jan 2010 19:46:21 +0100 |
| 280 |
Subject: [PATCH] uuid: preserve -m option status in -v option handling |
| 281 |
|
| 282 |
Bug: 531396 |
| 283 |
--- |
| 284 |
uuid_cli.c | 19 ++++++++++--------- |
| 285 |
1 files changed, 10 insertions(+), 9 deletions(-) |
| 286 |
|
| 287 |
diff --git a/uuid_cli.c b/uuid_cli.c |
| 288 |
index d1b0b11..14a67fe 100644 |
| 289 |
--- a/uuid_cli.c |
| 290 |
+++ b/uuid_cli.c |
| 291 |
@@ -140,11 +140,12 @@ int main(int argc, char *argv[]) |
| 292 |
i = strtol(optarg, &p, 10); |
| 293 |
if (*p != '\0') |
| 294 |
usage("invalid argument to option 'v'"); |
| 295 |
+ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); |
| 296 |
switch (i) { |
| 297 |
- case 1: version = UUID_MAKE_V1; break; |
| 298 |
- case 3: version = UUID_MAKE_V3; break; |
| 299 |
- case 4: version = UUID_MAKE_V4; break; |
| 300 |
- case 5: version = UUID_MAKE_V5; break; |
| 301 |
+ case 1: version |= UUID_MAKE_V1; break; |
| 302 |
+ case 3: version |= UUID_MAKE_V3; break; |
| 303 |
+ case 4: version |= UUID_MAKE_V4; break; |
| 304 |
+ case 5: version |= UUID_MAKE_V5; break; |
| 305 |
default: |
| 306 |
usage("invalid version on option 'v'"); |
| 307 |
break; |
| 308 |
@@ -213,10 +214,10 @@ int main(int argc, char *argv[]) |
| 309 |
} |
| 310 |
else { |
| 311 |
/* encoding */ |
| 312 |
- if ( (version == UUID_MAKE_V1 && argc != 0) |
| 313 |
- || (version == UUID_MAKE_V3 && argc != 2) |
| 314 |
- || (version == UUID_MAKE_V4 && argc != 0) |
| 315 |
- || (version == UUID_MAKE_V5 && argc != 2)) |
| 316 |
+ if ( (version & UUID_MAKE_V1 && argc != 0) |
| 317 |
+ || (version & UUID_MAKE_V3 && argc != 2) |
| 318 |
+ || (version & UUID_MAKE_V4 && argc != 0) |
| 319 |
+ || (version & UUID_MAKE_V5 && argc != 2)) |
| 320 |
usage("invalid number of arguments"); |
| 321 |
if ((rc = uuid_create(&uuid)) != UUID_RC_OK) |
| 322 |
error(1, "uuid_create: %s", uuid_error(rc)); |
| 323 |
@@ -232,7 +233,7 @@ int main(int argc, char *argv[]) |
| 324 |
if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) |
| 325 |
error(1, "uuid_load: %s", uuid_error(rc)); |
| 326 |
} |
| 327 |
- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { |
| 328 |
+ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { |
| 329 |
if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) |
| 330 |
error(1, "uuid_create: %s", uuid_error(rc)); |
| 331 |
if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { |
| 332 |
-- |
Archives