Tue Jul 12 00:19:45 2011 UTC ()
Avoid an shlibsign crash issue due to not finding libsqlite3.so.
Hopefully fixes PR pkg/44053.


(tnn)
diff -r1.45 -r1.46 pkgsrc/devel/xulrunner/distinfo
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-security_nss_cmd_shlibsign_sign.sh
diff -r1.61 -r1.62 pkgsrc/www/seamonkey/distinfo
diff -r0 -r1.1 pkgsrc/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh
cvs diff -r1.45 -r1.46 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2011/07/11 12:46:14 1.45
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2011/07/12 00:19:45 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.45 2011/07/11 12:46:14 tnn Exp $ 1$NetBSD: distinfo,v 1.46 2011/07/12 00:19:45 tnn Exp $
2 2
3SHA1 (firefox-5.0.source.tar.bz2) = 22b7b4751173c2142a0f09cca1aebc717d97b45a 3SHA1 (firefox-5.0.source.tar.bz2) = 22b7b4751173c2142a0f09cca1aebc717d97b45a
4RMD160 (firefox-5.0.source.tar.bz2) = 93d97a01f572f3688b0065c903afc3d7f9260179 4RMD160 (firefox-5.0.source.tar.bz2) = 93d97a01f572f3688b0065c903afc3d7f9260179
5Size (firefox-5.0.source.tar.bz2) = 68782151 bytes 5Size (firefox-5.0.source.tar.bz2) = 68782151 bytes
6SHA1 (patch-aa) = cbf636b05f5bb2165fa335dab83d25e78053cdb2 6SHA1 (patch-aa) = cbf636b05f5bb2165fa335dab83d25e78053cdb2
7SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997 7SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
8SHA1 (patch-ac) = 3d031c52056a4792119104e3c6a6f2377d00d04a 8SHA1 (patch-ac) = 3d031c52056a4792119104e3c6a6f2377d00d04a
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 338d84f6ffa2eefa942131e3f0b764948ac60e95 10SHA1 (patch-ae) = 338d84f6ffa2eefa942131e3f0b764948ac60e95
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0 12SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
@@ -50,26 +50,27 @@ SHA1 (patch-mh) = 0318566ecddafd00d4abd2 @@ -50,26 +50,27 @@ SHA1 (patch-mh) = 0318566ecddafd00d4abd2
50SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b 50SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
51SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f 51SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
52SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 52SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
53SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00 53SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
54SHA1 (patch-mm) = f103ec94a9d4c6c910eb9da9cc3df486b8294415 54SHA1 (patch-mm) = f103ec94a9d4c6c910eb9da9cc3df486b8294415
55SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203 55SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
56SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856 56SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
57SHA1 (patch-pa) = 11d8ec21533250a962d846e1d06b6a61722fcd60 57SHA1 (patch-pa) = 11d8ec21533250a962d846e1d06b6a61722fcd60
58SHA1 (patch-pb) = 9662aa24ed81760e9cdaffec17592cfe9bbbab22 58SHA1 (patch-pb) = 9662aa24ed81760e9cdaffec17592cfe9bbbab22
59SHA1 (patch-pc) = a0fbd378e0209259c97c8e24c8eccc02b543e08f 59SHA1 (patch-pc) = a0fbd378e0209259c97c8e24c8eccc02b543e08f
60SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0 60SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
61SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea 61SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
62SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67 62SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67
 63SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938
63SHA1 (patch-toolkit_toolkit-tiers.mk) = 53bbd10f337907d4a74a661719ab6637090b74c8 64SHA1 (patch-toolkit_toolkit-tiers.mk) = 53bbd10f337907d4a74a661719ab6637090b74c8
64SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72 65SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
65SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201 66SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
66SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965 67SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
67SHA1 (patch-xd) = 2ddf436186ccebab28380b9e80f52f061ca3d73e 68SHA1 (patch-xd) = 2ddf436186ccebab28380b9e80f52f061ca3d73e
68SHA1 (patch-xe) = 1bcd9def6f9636fa9deb0edb994e5672529b615b 69SHA1 (patch-xe) = 1bcd9def6f9636fa9deb0edb994e5672529b615b
69SHA1 (patch-xf) = 5e68024f66e5ba9086ed6ec4a0cc562714e99219 70SHA1 (patch-xf) = 5e68024f66e5ba9086ed6ec4a0cc562714e99219
70SHA1 (patch-xg) = d8355840ee91dd64ff650a12be87f2c51d8df196 71SHA1 (patch-xg) = d8355840ee91dd64ff650a12be87f2c51d8df196
71SHA1 (patch-xj) = 7e237668aa4dfa55833d125d2a1464fb97ae3ada 72SHA1 (patch-xj) = 7e237668aa4dfa55833d125d2a1464fb97ae3ada
72SHA1 (patch-xk) = 16ac8dc3bb5c241452eae6833d40aaf876453761 73SHA1 (patch-xk) = 16ac8dc3bb5c241452eae6833d40aaf876453761
73SHA1 (patch-xl) = afd74085c01d207907d0b3bfc040bf92fd1ba8b1 74SHA1 (patch-xl) = afd74085c01d207907d0b3bfc040bf92fd1ba8b1
74SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e 75SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e
75SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01 76SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01
File Added: pkgsrc/devel/xulrunner/patches/Attic/patch-security_nss_cmd_shlibsign_sign.sh
$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.1 2011/07/12 00:19:45 tnn Exp $

This tries to dlopen libsoftokn3.so which is linked against sqlite3,
so we need a directory containing libsqlite3.so in the search path,
beside the directory containing libsoftokn3.so itself.

--- security/nss/cmd/shlibsign/sign.sh.orig	2011-06-15 21:57:52.000000000 +0000
+++ security/nss/cmd/shlibsign/sign.sh
@@ -26,7 +26,7 @@ WIN*)
     export LIBPATH
     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
     export SHLIB_PATH
-    LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH
cvs diff -r1.61 -r1.62 pkgsrc/www/seamonkey/distinfo (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/distinfo 2011/07/11 20:46:36 1.61
+++ pkgsrc/www/seamonkey/distinfo 2011/07/12 00:19:45 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.61 2011/07/11 20:46:36 tnn Exp $ 1$NetBSD: distinfo,v 1.62 2011/07/12 00:19:45 tnn Exp $
2 2
3SHA1 (seamonkey-2.2.source.tar.bz2) = bb2181fbbb4aa16e51899b483acadb31f7e0cbbc 3SHA1 (seamonkey-2.2.source.tar.bz2) = bb2181fbbb4aa16e51899b483acadb31f7e0cbbc
4RMD160 (seamonkey-2.2.source.tar.bz2) = cfad0460357c357df7a5936c0bd10374c18eac04 4RMD160 (seamonkey-2.2.source.tar.bz2) = cfad0460357c357df7a5936c0bd10374c18eac04
5Size (seamonkey-2.2.source.tar.bz2) = 87478968 bytes 5Size (seamonkey-2.2.source.tar.bz2) = 87478968 bytes
6SHA1 (patch-aa) = e706aec36f62f3c96998a50d907bb4bd1452f156 6SHA1 (patch-aa) = e706aec36f62f3c96998a50d907bb4bd1452f156
7SHA1 (patch-aa-toplevel) = 8089c05ca0e49b695f8ea5e5e62925ff291fc11c 7SHA1 (patch-aa-toplevel) = 8089c05ca0e49b695f8ea5e5e62925ff291fc11c
8SHA1 (patch-ab) = c2bffac6626ce22d15855a80d84ffac6cbd52fe2 8SHA1 (patch-ab) = c2bffac6626ce22d15855a80d84ffac6cbd52fe2
9SHA1 (patch-ac) = cbbc17c71dd96969079fc7268b15f822a29d01aa 9SHA1 (patch-ac) = cbbc17c71dd96969079fc7268b15f822a29d01aa
10SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105 10SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
11SHA1 (patch-ae) = fbac9ab81d0c098d29d9f8fa1af47bed634e8bfd 11SHA1 (patch-ae) = fbac9ab81d0c098d29d9f8fa1af47bed634e8bfd
12SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7 12SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
13SHA1 (patch-ag) = 22cca24b67c85fbf9bafb35441dfcb460ecde6bf 13SHA1 (patch-ag) = 22cca24b67c85fbf9bafb35441dfcb460ecde6bf
14SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235 14SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
@@ -53,26 +53,27 @@ SHA1 (patch-mh) = 36a434488f3389407c6ebc @@ -53,26 +53,27 @@ SHA1 (patch-mh) = 36a434488f3389407c6ebc
53SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a 53SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
54SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b 54SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b
55SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b 55SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
56SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68 56SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68
57SHA1 (patch-mm) = f54286fe1acef3202d728b3e83cbd65cffe8ab12 57SHA1 (patch-mm) = f54286fe1acef3202d728b3e83cbd65cffe8ab12
58SHA1 (patch-mn) = 3a1c25a3f5a1532331424fc1e720f35cd0ed5d5b 58SHA1 (patch-mn) = 3a1c25a3f5a1532331424fc1e720f35cd0ed5d5b
59SHA1 (patch-mp) = 673ba7fb0426d13699ead5fbcf762d8adb6baf40 59SHA1 (patch-mp) = 673ba7fb0426d13699ead5fbcf762d8adb6baf40
60SHA1 (patch-pa) = a41a2dadd3b1c902f85632a4b57008a789b269bc 60SHA1 (patch-pa) = a41a2dadd3b1c902f85632a4b57008a789b269bc
61SHA1 (patch-pb) = 11dada932534519ccf54998d027cf6f69d7b0d1d 61SHA1 (patch-pb) = 11dada932534519ccf54998d027cf6f69d7b0d1d
62SHA1 (patch-pc) = 44e3f13be743971839e62fa313000ebc30275ed4 62SHA1 (patch-pc) = 44e3f13be743971839e62fa313000ebc30275ed4
63SHA1 (patch-pd) = 1f12080244c75f42e4edbe623a15fd2ac6abd6d4 63SHA1 (patch-pd) = 1f12080244c75f42e4edbe623a15fd2ac6abd6d4
64SHA1 (patch-pg) = e022af26945893d2a61ec4ca3a414ccb6150a235 64SHA1 (patch-pg) = e022af26945893d2a61ec4ca3a414ccb6150a235
65SHA1 (patch-rc) = b3b0577e9421fcdcab5bcd29ab7fa12d2ba2ac45 65SHA1 (patch-rc) = b3b0577e9421fcdcab5bcd29ab7fa12d2ba2ac45
 66SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 3e0170a8eb75cb42fdce529c3bbc67b6aaa29500
66SHA1 (patch-toolkit_toolkit-tiers.mk) = 76de271f8a2b08cc3b809e3c1635a1313d3feced 67SHA1 (patch-toolkit_toolkit-tiers.mk) = 76de271f8a2b08cc3b809e3c1635a1313d3feced
67SHA1 (patch-xa) = 0acaf27d8687c7cb5a46fc3773097a3dea4c75d9 68SHA1 (patch-xa) = 0acaf27d8687c7cb5a46fc3773097a3dea4c75d9
68SHA1 (patch-xb) = 07a90e393dbb38a98e8d9954387757d21d3e65cf 69SHA1 (patch-xb) = 07a90e393dbb38a98e8d9954387757d21d3e65cf
69SHA1 (patch-xc) = 98c8b4193dde73f28747c8ac870071f1debbe9f0 70SHA1 (patch-xc) = 98c8b4193dde73f28747c8ac870071f1debbe9f0
70SHA1 (patch-xd) = 927a73f9ba1f516a10e83dbe5f00744acc6a88df 71SHA1 (patch-xd) = 927a73f9ba1f516a10e83dbe5f00744acc6a88df
71SHA1 (patch-xe) = 945bce0dc7347392b992b9698597d8584557d51e 72SHA1 (patch-xe) = 945bce0dc7347392b992b9698597d8584557d51e
72SHA1 (patch-xf) = 34d671d4e615a694e3add3303eaae5e23c7df3ac 73SHA1 (patch-xf) = 34d671d4e615a694e3add3303eaae5e23c7df3ac
73SHA1 (patch-xg) = 4fdf27307cfb3bf3cb33440da75704b149fc2aaa 74SHA1 (patch-xg) = 4fdf27307cfb3bf3cb33440da75704b149fc2aaa
74SHA1 (patch-xj) = 452d87313b29510fb02e804545c17193e2c822bf 75SHA1 (patch-xj) = 452d87313b29510fb02e804545c17193e2c822bf
75SHA1 (patch-xk) = b50b34041b75b1590f021592b1e26893ae458a01 76SHA1 (patch-xk) = b50b34041b75b1590f021592b1e26893ae458a01
76SHA1 (patch-xl) = 1425f9e5fd0dc49f3204730d1d88b9600d6475e4 77SHA1 (patch-xl) = 1425f9e5fd0dc49f3204730d1d88b9600d6475e4
77SHA1 (patch-xm) = 270e762936fe686cc55b820d52e15421b27c7c2c 78SHA1 (patch-xm) = 270e762936fe686cc55b820d52e15421b27c7c2c
78SHA1 (patch-xn) = edd741e4e71ecb44fc58750727aac473ff2e628e 79SHA1 (patch-xn) = edd741e4e71ecb44fc58750727aac473ff2e628e
File Added: pkgsrc/www/seamonkey/patches/Attic/patch-security_nss_cmd_shlibsign_sign.sh
$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.1 2011/07/12 00:19:45 tnn Exp $

This tries to dlopen libsoftokn3.so which is linked against sqlite3,
so we need a directory containing libsqlite3.so in the search path,
beside the directory containing libsoftokn3.so itself.

--- mozilla/security/nss/cmd/shlibsign/sign.sh.orig	2011-06-15 21:57:52.000000000 +0000
+++ mozilla/security/nss/cmd/shlibsign/sign.sh
@@ -26,7 +26,7 @@ WIN*)
     export LIBPATH
     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
     export SHLIB_PATH
-    LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH