summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ossp-uuid/ossp-uuid
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/ossp-uuid/ossp-uuid')
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch119
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch62
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch58
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch43
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch19
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch27
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch19
7 files changed, 347 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
new file mode 100644
index 0000000000..ed67c501cb
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
@@ -0,0 +1,119 @@
1From: Piotr Roszatycki <dexter@debian.org>
2Date: Wed, 27 Jan 2010 16:53:11 +0100
3Subject: [PATCH] Change library name
4
5The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's
6uuid library.
7---
8 Makefile.in | 6 +++---
9 perl/Makefile.PL | 12 ++++++------
10 php/config.m4 | 2 +-
11 uuid-config.in | 2 +-
12 uuid.pc.in | 4 ++--
13 5 files changed, 13 insertions(+), 13 deletions(-)
14
15----
16Upstream-Status: Inappropriate [not author]
17
18This patch is from debian ossp-uuid 1.6.2 integration.
19
20Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
21
22diff --git a/Makefile.in b/Makefile.in
23index d28f4be..c2ba99d 100644
24--- a/Makefile.in
25+++ b/Makefile.in
26@@ -62,13 +62,13 @@ PERL = @PERL@
27 PHP = @PHP@
28 PG_CONFIG = @PG_CONFIG@
29
30-LIB_NAME = libuuid.la
31+LIB_NAME = libossp-uuid.la
32 LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
33
34-DCE_NAME = libuuid_dce.la
35+DCE_NAME = libossp-uuid_dce.la
36 DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
37
38-CXX_NAME = libuuid++.la
39+CXX_NAME = libossp-uuid++.la
40 CXX_OBJS = uuid++.lo $(LIB_OBJS)
41
42 PRG_NAME = uuid
43diff --git a/perl/Makefile.PL b/perl/Makefile.PL
44index 92f4494..9c6fee6 100644
45--- a/perl/Makefile.PL
46+++ b/perl/Makefile.PL
47@@ -33,9 +33,9 @@ use Config;
48 use ExtUtils::MakeMaker;
49
50 # determine source directory
51-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
52- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
53- or die "no source directory found (where libuuid.la is located)";
54+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
55+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
56+ or die "no source directory found (where libossp-uuid.la is located)";
57
58 # determine extra build options
59 my $compat = 0;
60@@ -47,15 +47,15 @@ WriteMakefile(
61 VERSION_FROM => 'uuid.pm',
62 ABSTRACT_FROM => 'uuid.pod',
63 PREREQ_PM => {},
64- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
65+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
66 DEFINE => '',
67 INC => "-I. -I$srcdir",
68 PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
69 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod',
70 ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()),
71 ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
72- MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
73- ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), },
74+ MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
75+ ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), },
76 TYPEMAPS => [ 'uuid.tm' ],
77 test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') },
78 NO_META => 1,
79diff --git a/php/config.m4 b/php/config.m4
80index 5091b96..969b457 100644
81--- a/php/config.m4
82+++ b/php/config.m4
83@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then
84 PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
85 AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
86 PHP_ADD_LIBPATH([..], )
87- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
88+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
89 PHP_ADD_INCLUDE([..])
90 PHP_SUBST(UUID_SHARED_LIBADD)
91
92diff --git a/uuid-config.in b/uuid-config.in
93index 8d2a063..5b58812 100644
94--- a/uuid-config.in
95+++ b/uuid-config.in
96@@ -121,7 +121,7 @@ do
97 output_extra="$output_extra $uuid_ldflags"
98 ;;
99 --libs)
100- output="$output -luuid"
101+ output="$output -lossp-uuid"
102 output_extra="$output_extra $uuid_libs"
103 ;;
104 * )
105diff --git a/uuid.pc.in b/uuid.pc.in
106index c76ad1e..de00c2f 100644
107--- a/uuid.pc.in
108+++ b/uuid.pc.in
109@@ -36,7 +36,7 @@ Name: OSSP uuid
110 Description: Universally Unique Identifier (UUID) Library
111 Version: @UUID_VERSION_RAW@
112 URL: http://www.ossp.org/pkg/lib/uuid/
113-Cflags: -I${includedir}
114-Libs: -L${libdir} -luuid
115+Cflags: -I${includedir}/ossp
116+Libs: -L${libdir} -lossp-uuid
117 Libs.private: @LIBS@
118
119--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
new file mode 100644
index 0000000000..804a62731d
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
@@ -0,0 +1,62 @@
1From: Marco Nenciarini <marco.nenciarini@devise.it>
2Date: Wed, 27 Jan 2010 19:46:21 +0100
3Subject: [PATCH] uuid: preserve -m option status in -v option handling
4
5Bug: 531396
6---
7 uuid_cli.c | 19 ++++++++++---------
8 1 files changed, 10 insertions(+), 9 deletions(-)
9
10----
11Upstream-Status: Inappropriate [not author]
12
13This patch is from debian ossp-uuid 1.6.2 integration.
14
15Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
16
17diff --git a/uuid_cli.c b/uuid_cli.c
18index d1b0b11..14a67fe 100644
19--- a/uuid_cli.c
20+++ b/uuid_cli.c
21@@ -140,11 +140,12 @@ int main(int argc, char *argv[])
22 i = strtol(optarg, &p, 10);
23 if (*p != '\0')
24 usage("invalid argument to option 'v'");
25+ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5);
26 switch (i) {
27- case 1: version = UUID_MAKE_V1; break;
28- case 3: version = UUID_MAKE_V3; break;
29- case 4: version = UUID_MAKE_V4; break;
30- case 5: version = UUID_MAKE_V5; break;
31+ case 1: version |= UUID_MAKE_V1; break;
32+ case 3: version |= UUID_MAKE_V3; break;
33+ case 4: version |= UUID_MAKE_V4; break;
34+ case 5: version |= UUID_MAKE_V5; break;
35 default:
36 usage("invalid version on option 'v'");
37 break;
38@@ -213,10 +214,10 @@ int main(int argc, char *argv[])
39 }
40 else {
41 /* encoding */
42- if ( (version == UUID_MAKE_V1 && argc != 0)
43- || (version == UUID_MAKE_V3 && argc != 2)
44- || (version == UUID_MAKE_V4 && argc != 0)
45- || (version == UUID_MAKE_V5 && argc != 2))
46+ if ( (version & UUID_MAKE_V1 && argc != 0)
47+ || (version & UUID_MAKE_V3 && argc != 2)
48+ || (version & UUID_MAKE_V4 && argc != 0)
49+ || (version & UUID_MAKE_V5 && argc != 2))
50 usage("invalid number of arguments");
51 if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
52 error(1, "uuid_create: %s", uuid_error(rc));
53@@ -232,7 +233,7 @@ int main(int argc, char *argv[])
54 if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK)
55 error(1, "uuid_load: %s", uuid_error(rc));
56 }
57- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) {
58+ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) {
59 if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK)
60 error(1, "uuid_create: %s", uuid_error(rc));
61 if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) {
62--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
new file mode 100644
index 0000000000..13cbb59896
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
@@ -0,0 +1,58 @@
1From: Marco Nenciarini <marco.nenciarini@devise.it>
2Date: Tue, 2 Feb 2010 12:16:49 +0100
3Subject: [PATCH] Fix whatis entries
4
5Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
6---
7 uuid++.pod | 2 +-
8 uuid.pod | 2 +-
9 uuid_cli.pod | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12----
13Upstream-Status: Inappropriate [not author]
14
15This patch is from debian ossp-uuid 1.6.2 integration.
16
17Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
18
19diff --git a/uuid++.pod b/uuid++.pod
20index 8b5a4b1..89c5efb 100644
21--- a/uuid++.pod
22+++ b/uuid++.pod
23@@ -31,7 +31,7 @@
24
25 =head1 NAME
26
27-B<OSSP uuid> - B<Universally Unique Identifier> (C++ API)
28+B<uuid++> - B<Universally Unique Identifier> (C++ API)
29
30 =head1 VERSION
31
32diff --git a/uuid.pod b/uuid.pod
33index 4ad3742..0179a46 100644
34--- a/uuid.pod
35+++ b/uuid.pod
36@@ -31,7 +31,7 @@
37
38 =head1 NAME
39
40-B<OSSP uuid> - B<Universally Unique Identifier>
41+B<uuid> - B<Universally Unique Identifier>
42
43 =head1 VERSION
44
45diff --git a/uuid_cli.pod b/uuid_cli.pod
46index ddec6bb..df9dc83 100644
47--- a/uuid_cli.pod
48+++ b/uuid_cli.pod
49@@ -31,7 +31,7 @@
50
51 =head1 NAME
52
53-B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool>
54+B<uuid> - B<Universally Unique Identifier Command-Line Tool>
55
56 =head1 VERSION
57
58--
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
new file mode 100644
index 0000000000..bc5e111ee5
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
@@ -0,0 +1,43 @@
1Description: Support dash-less args to from_string.
2Author: Tim Retout <diocles@debian.org>
3Bug-Debian: http://bugs.debian.org/635607
4
5The module Data::GUID depends on Data::UUID supporting this behaviour.
6
7----
8Upstream-Status: Inappropriate [not author]
9
10This patch is from debian ossp-uuid 1.6.2 integration.
11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13
14--- a/perl/uuid_compat.pm
15+++ b/perl/uuid_compat.pm
16@@ -93,7 +93,9 @@
17 $uuid->import('str',
18 $str =~ /^0x/
19 ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str)
20- : $str
21+ : $str =~ /-/
22+ ? $str
23+ : join '-', unpack('A8 A4 A4 A4 A12', $str)
24 );
25 return $uuid->export('bin');
26 }
27--- a/perl/uuid_compat.ts
28+++ b/perl/uuid_compat.ts
29@@ -28,7 +28,7 @@
30 ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part)
31 ##
32
33-use Test::More tests => 14;
34+use Test::More tests => 16;
35
36 BEGIN {
37 use_ok('Data::UUID');
38@@ -53,3 +53,5 @@
39 ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8"));
40 ok($ug->compare($uuid7, $uuid8) == 0);
41
42+ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8"));
43+ok($ug->compare($uuid7, $uuid9) == 0);
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
new file mode 100644
index 0000000000..04222cbf7a
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
@@ -0,0 +1,19 @@
1uuid.pc is generated at build time so should be installed from the current
2directory, and not $S.
3
4Upstream-Status: Pending [should be submitted]
5Signed-Off-By: Ross Burton <ross.burton@intel.com>
6
7Index: uuid-1.6.2/Makefile.in
8===================================================================
9--- uuid-1.6.2.orig/Makefile.in 2012-11-13 16:58:28.624156000 +0000
10+++ uuid-1.6.2/Makefile.in 2012-11-13 17:05:24.224158670 +0000
11@@ -232,7 +232,7 @@
12 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
13 $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
14 $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
15- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
16+ $(SHTOOL) install -c -m 644 uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
17 $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
18 -@if [ ".$(WITH_DCE)" = .yes ]; then \
19 echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
new file mode 100644
index 0000000000..4bc91b86ee
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
@@ -0,0 +1,27 @@
1Remove hardcoded libtool name, fall back to generated name
2
3Upstream-Status: Inappropriate [no upstream]
4The project appears to no longer be accepting changes.
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
9--- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:37:19.579672930 -0500
10+++ uuid-1.6.2/Makefile.in 2012-05-14 14:37:49.112733787 -0500
11@@ -32,6 +32,7 @@
12 VPATH = @srcdir@
13 srcdir = @srcdir@
14 top_srcdir = @top_srcdir@
15+top_builddir = @top_builddir@
16 S = $(srcdir)
17 C = .
18
19@@ -55,7 +56,7 @@
20 CP = cp
21 RMDIR = rmdir
22 SHTOOL = $(S)/shtool
23-LIBTOOL = $(C)/libtool
24+LIBTOOL = @LIBTOOL@
25 TRUE = true
26 POD2MAN = pod2man
27 PERL = @PERL@
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
new file mode 100644
index 0000000000..d806b5fb70
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
@@ -0,0 +1,19 @@
1We don't want anything stripped
2
3Upstream-Status: Inappropriate [no upstream]
4The project appears to no longer be accepting changes.
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
9--- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:42:42.225789456 -0500
10+++ uuid-1.6.2/Makefile.in 2012-05-14 15:03:03.119733400 -0500
11@@ -254,7 +254,7 @@
12 -@if [ ".$(WITH_CXX)" = .yes ]; then \
13 $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
14 fi
15- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
16+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
17 $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
18 -@if [ ".$(WITH_PERL)" = .yes ]; then \
19 (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-20 02:19:40 +0000