pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/firefox
Module Name: pkgsrc
Committed By: ryoon
Date: Tue Oct 17 03:39:04 UTC 2017
Modified Files:
pkgsrc/www/firefox: PLIST distinfo options.mk
Added Files:
pkgsrc/www/firefox/patches: patch-netwerk_srtp_src_crypto_hash_hmac.c
patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
Log Message:
Fix webrtc build on recent NetBSD current
>From rjs@. Thank you.
WebRTC connection works.
However video capture does not work.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.296 -r1.297 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r0 -r1.4 \
pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
cvs rdiff -u -r0 -r1.3 \
pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.123 pkgsrc/www/firefox/PLIST:1.124
--- pkgsrc/www/firefox/PLIST:1.123 Sat Sep 30 05:34:11 2017
+++ pkgsrc/www/firefox/PLIST Tue Oct 17 03:39:04 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.123 2017/09/30 05:34:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.124 2017/10/17 03:39:04 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -3295,6 +3295,7 @@ lib/firefox/chrome/toolkit/content/globa
lib/firefox/chrome/toolkit/content/global/autocomplete.css
lib/firefox/chrome/toolkit/content/global/backgroundPageThumbs.xhtml
lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js
+${PLIST.webrtc}lib/firefox/components/PeerConnection.js
lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml
lib/firefox/chrome/toolkit/content/global/bindings/browser.xml
lib/firefox/chrome/toolkit/content/global/bindings/button.xml
Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.296 pkgsrc/www/firefox/distinfo:1.297
--- pkgsrc/www/firefox/distinfo:1.296 Sat Sep 30 05:34:11 2017
+++ pkgsrc/www/firefox/distinfo Tue Oct 17 03:39:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.296 2017/09/30 05:34:11 ryoon Exp $
+$NetBSD: distinfo,v 1.297 2017/10/17 03:39:04 ryoon Exp $
SHA1 (firefox-56.0.source.tar.xz) = 806cb335752ee93b204750b89dc6940768408088
RMD160 (firefox-56.0.source.tar.xz) = b5239242e55e3031838c9807bff47b5b9c9fb420
@@ -70,6 +70,8 @@ SHA1 (patch-modules_pdfium_update.sh) =
SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
+SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 8ba57212adca077fb5cfa50d752a97b0e3becc6d
+SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = 08f3a347745b5529749328ad3a070fb78a75c1e9
SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.42 pkgsrc/www/firefox/options.mk:1.43
--- pkgsrc/www/firefox/options.mk:1.42 Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/options.mk Tue Oct 17 03:39:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.42 2017/08/10 14:46:15 ryoon Exp $
+# $NetBSD: options.mk,v 1.43 2017/10/17 03:39:04 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
@@ -13,7 +13,6 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil
PKG_SUGGESTED_OPTIONS+= oss dbus
.endif
-# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
PKG_SUGGESTED_OPTIONS.Linux+= webrtc
.include "../../mk/bsd.options.mk"
@@ -100,6 +99,7 @@ PLIST_VARS+= webrtc
.if !empty(PKG_OPTIONS:Mwebrtc)
.include "../../graphics/libv4l/buildlink3.mk"
CONFIGURE_ARGS+= --enable-webrtc
+PLIST.webrtc= yes
.else
CONFIGURE_ARGS+= --disable-webrtc
.endif
Added files:
Index: pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
diff -u /dev/null pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c:1.4
--- /dev/null Tue Oct 17 03:39:04 2017
+++ pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c Tue Oct 17 03:39:04 2017
@@ -0,0 +1,56 @@
+$NetBSD: patch-netwerk_srtp_src_crypto_hash_hmac.c,v 1.4 2017/10/17 03:39:04 ryoon Exp $
+
+--- netwerk/srtp/src/crypto/hash/hmac.c.orig 2017-06-15 20:52:29.000000000 +0000
++++ netwerk/srtp/src/crypto/hash/hmac.c
+@@ -55,7 +55,7 @@ debug_module_t mod_hmac = {
+
+ err_status_t
+ hmac_alloc(auth_t **a, int key_len, int out_len) {
+- extern auth_type_t hmac;
++ extern auth_type_t hmac_auth;
+ uint8_t *pointer;
+
+ debug_print(mod_hmac, "allocating auth func with key length %d", key_len);
+@@ -79,21 +79,21 @@ hmac_alloc(auth_t **a, int key_len, int
+
+ /* set pointers */
+ *a = (auth_t *)pointer;
+- (*a)->type = &hmac;
++ (*a)->type = &hmac_auth;
+ (*a)->state = pointer + sizeof(auth_t);
+ (*a)->out_len = out_len;
+ (*a)->key_len = key_len;
+ (*a)->prefix_len = 0;
+
+ /* increment global count of all hmac uses */
+- hmac.ref_count++;
++ hmac_auth.ref_count++;
+
+ return err_status_ok;
+ }
+
+ err_status_t
+ hmac_dealloc(auth_t *a) {
+- extern auth_type_t hmac;
++ extern auth_type_t hmac_auth;
+
+ /* zeroize entire state*/
+ octet_string_set_to_zero((uint8_t *)a,
+@@ -103,7 +103,7 @@ hmac_dealloc(auth_t *a) {
+ crypto_free(a);
+
+ /* decrement global count of all hmac uses */
+- hmac.ref_count--;
++ hmac_auth.ref_count--;
+
+ return err_status_ok;
+ }
+@@ -252,7 +252,7 @@ char hmac_description[] = "hmac sha-1 au
+ */
+
+ auth_type_t
+-hmac = {
++hmac_auth = {
+ (auth_alloc_func) hmac_alloc,
+ (auth_dealloc_func) hmac_dealloc,
+ (auth_init_func) hmac_init,
Index: pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
diff -u /dev/null pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c:1.3
--- /dev/null Tue Oct 17 03:39:04 2017
+++ pkgsrc/www/firefox/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c Tue Oct 17 03:39:04 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c,v 1.3 2017/10/17 03:39:04 ryoon Exp $
+
+--- netwerk/srtp/src/crypto/kernel/crypto_kernel.c.orig 2017-06-15 20:52:29.000000000 +0000
++++ netwerk/srtp/src/crypto/kernel/crypto_kernel.c
+@@ -77,7 +77,7 @@ extern cipher_type_t aes_cbc;
+ */
+
+ extern auth_type_t null_auth;
+-extern auth_type_t hmac;
++extern auth_type_t hmac_auth;
+
+ /* crypto_kernel is a global variable, the only one of its datatype */
+
+@@ -162,7 +162,7 @@ crypto_kernel_init() {
+ status = crypto_kernel_load_auth_type(&null_auth, NULL_AUTH);
+ if (status)
+ return status;
+- status = crypto_kernel_load_auth_type(&hmac, HMAC_SHA1);
++ status = crypto_kernel_load_auth_type(&hmac_auth, HMAC_SHA1);
+ if (status)
+ return status;
+
Home |
Main Index |
Thread Index |
Old Index