Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 485518) +++ head/www/cliqz/Makefile (revision 485519) @@ -1,110 +1,109 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.22.3 +DISTVERSION= 1.23.3 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz DISTFILES= adult-domains.bin:amazon \ cliqz@cliqz.com.xpi:cliqz \ https-everywhere@cliqz.com.xpi:cliqz \ gdprtool@cliqz.com.xpi:cliqz EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= santhosh.raju@gmail.com COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libnspr4.so:devel/nspr \ libplc4.so:devel/nspr \ libplds4.so:devel/nspr \ libnssutil3.so:security/nss BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.12:graphics/graphite2 \ harfbuzz>=1.8.8:print/harfbuzz \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ + node:www/node \ nspr>=4.19:devel/nspr \ nss>=3.39:security/nss \ png>=1.6.34:graphics/png \ ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ rust>=1.28:lang/rust \ rust-cbindgen>=0.6.2:devel/rust-cbindgen \ sqlite3>=3.24.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip USES= tar:xz gmake pkgconfig gnome python desktop-file-utils USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2 USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \ xcb xt -LLVM_DEFAULT?= 70 - USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes CLIQZ_CHANNEL= release # If the DISTVERSION is updated, make sure to update the last build id from -# fetch -qo - https://s3.amazonaws.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid -CLIQZ_LAST_BUILD_ID= 20181005182933 +# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid +CLIQZ_LAST_BUILD_ID= 20181116003917 CLIQZ_ICON= ${PORTNAME}.png CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop MAKE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} post-install: ${LN} -sf ${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} .include Index: head/www/cliqz/distinfo =================================================================== --- head/www/cliqz/distinfo (revision 485518) +++ head/www/cliqz/distinfo (revision 485519) @@ -1,11 +1,11 @@ -TIMESTAMP = 1542458862 +TIMESTAMP = 1542750770 SHA256 (adult-domains.bin) = ca599140fe3c0be40426d5dfba99b9e4280031d6dc7fbe287fb7a0ac44f5978e SIZE (adult-domains.bin) = 528392 SHA256 (cliqz@cliqz.com.xpi) = 5038729253e070d80a8a2413d9cb758498f5ea6c30bd6063a837305756fa3216 SIZE (cliqz@cliqz.com.xpi) = 24114265 SHA256 (https-everywhere@cliqz.com.xpi) = 231f5f18a931e1e092a233b814b8fe443adcc7d37be8c8c0ac9a8fa887c5e090 SIZE (https-everywhere@cliqz.com.xpi) = 1991678 SHA256 (gdprtool@cliqz.com.xpi) = 8e58c58afa60a2e30aeafb52e92bdc4ca03f5caf5594bbdf173752b715a28f40 SIZE (gdprtool@cliqz.com.xpi) = 259585 -SHA256 (cliqz-oss-browser-f-1.22.3_GH0.tar.gz) = 09e6677fb109363a3d2fd6c676315ee831d8c5901dc420e351f10f0d797432bd -SIZE (cliqz-oss-browser-f-1.22.3_GH0.tar.gz) = 387948437 +SHA256 (cliqz-oss-browser-f-1.23.3_GH0.tar.gz) = 635ec83abcda27f09b6203ec919ab8aa50548659a637986f099080926d756a3b +SIZE (cliqz-oss-browser-f-1.23.3_GH0.tar.gz) = 400171513 Index: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c =================================================================== --- head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c (nonexistent) @@ -1,11 +0,0 @@ ---- mozilla-release/ipc/chromium/src/third_party/libevent/evutil_rand.c.orig 2018-10-05 16:27:24 UTC -+++ mozilla-release/ipc/chromium/src/third_party/libevent/evutil_rand.c -@@ -192,7 +192,7 @@ evutil_secure_rng_get_bytes(void *buf, s - ev_arc4random_buf(buf, n); - } - --#if !defined(__OpenBSD__) && !defined(ANDROID) -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) - void - evutil_secure_rng_add_bytes(const char *buf, size_t n) - { Property changes on: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch =================================================================== --- head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch (nonexistent) @@ -1,68 +0,0 @@ ---- mozilla-release/ipc/chromium/src/third_party/libevent/patches/openbsd-no-arc4random_addrandom.patch.orig 2018-10-05 16:27:24 UTC -+++ mozilla-release/ipc/chromium/src/third_party/libevent/patches/openbsd-no-arc4random_addrandom.patch -@@ -1,16 +1,16 @@ - diff --git a/ipc/chromium/src/third_party/libevent/evutil_rand.c b/ipc/chromium/src/third_party/libevent/evutil_rand.c - --- a/ipc/chromium/src/third_party/libevent/evutil_rand.c - +++ b/ipc/chromium/src/third_party/libevent/evutil_rand.c --@@ -187,20 +187,22 @@ ev_arc4random_buf(void *buf, size_t n) -+@@ -187,14 +187,16 @@ ev_arc4random_buf(void *buf, size_t n) - #endif /* } !EVENT__HAVE_ARC4RANDOM */ -- -+ - void - evutil_secure_rng_get_bytes(void *buf, size_t n) - { - ev_arc4random_buf(buf, n); - } -- --+#if !defined(__OpenBSD__) && !defined(ANDROID) -+ -++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) - void - evutil_secure_rng_add_bytes(const char *buf, size_t n) - { -@@ -18,7 +18,7 @@ diff --git a/ipc/chromium/src/third_part - n>(size_t)INT_MAX ? INT_MAX : (int)n); - } - +#endif -- -+ - void - evutil_free_secure_rng_globals_(void) - { -@@ -35,28 +35,28 @@ diff --git a/ipc/chromium/src/third_part - */ - EVENT2_EXPORT_SYMBOL - int evutil_secure_rng_set_urandom_device_file(char *fname); -- --+#if !defined(__OpenBSD__) && !defined(ANDROID) -+ -++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) - /** Seed the random number generator with extra random bytes. -- -+ - You should almost never need to call this function; it should be - sufficient to invoke evutil_secure_rng_init(), or let Libevent take - care of calling evutil_secure_rng_init() on its own. -- -+ - If you call this function as a _replacement_ for the regular - entropy sources, then you need to be sure that your input - contains a fairly large amount of strong entropy. Doing so is - notoriously hard: most people who try get it wrong. Watch out! -- -+ - @param dat a buffer full of a strong source of random numbers - @param datlen the number of bytes to read from datlen - */ - EVENT2_EXPORT_SYMBOL - void evutil_secure_rng_add_bytes(const char *dat, size_t datlen); - +#endif -- -+ - #ifdef __cplusplus - } - #endif -- -+ - #endif /* EVENT1_EVUTIL_H_INCLUDED_ */ Property changes on: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h =================================================================== --- head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h (nonexistent) @@ -1,11 +0,0 @@ ---- mozilla-release/ipc/chromium/src/third_party/libevent/include/event2/util.h.orig 2018-11-12 18:39:53 UTC -+++ mozilla-release/ipc/chromium/src/third_party/libevent/include/event2/util.h -@@ -842,7 +842,7 @@ int evutil_secure_rng_init(void); - EVENT2_EXPORT_SYMBOL - int evutil_secure_rng_set_urandom_device_file(char *fname); - --#if !defined(__OpenBSD__) && !defined(ANDROID) -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) - /** Seed the random number generator with extra random bytes. - - You should almost never need to call this function; it should be Property changes on: head/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c =================================================================== --- head/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c (nonexistent) @@ -1,12 +0,0 @@ ---- mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c.orig 2018-10-05 16:27:24 UTC -+++ mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c -@@ -911,7 +911,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor - * From the semctl(2) man page in glibc 2.0 - */ - #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ -- || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ -+ || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ -+ || defined(OPENBSD) || defined(BSDI) \ - || defined(DARWIN) || defined(SYMBIAN) - /* union semun is defined by including */ - #else Property changes on: head/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig =================================================================== --- head/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig (revision 485519) @@ -1,10 +1,11 @@ ---- mozilla-release/browser/config/cliqz.mozconfig.orig 2018-10-05 16:27:24 UTC +--- mozilla-release/browser/config/cliqz.mozconfig.orig 2018-11-16 08:40:07 UTC +++ mozilla-release/browser/config/cliqz.mozconfig -@@ -10,6 +10,7 @@ ac_add_options --enable-official-brandin +@@ -10,6 +10,8 @@ ac_add_options --enable-official-brandin ac_add_options --with-app-name=cliqz # name for binaries ac_add_options --enable-crashreporter ac_add_options --enable-js-shell +ac_add_options --disable-crashreporter ++ac_add_options --disable-updater export MOZ_APP_PROFILE=CLIQZ export MOZ_AUTOMATION_UPLOAD=1 Index: head/www/cliqz/files/patch-mozilla-release_config_rules.mk =================================================================== --- head/www/cliqz/files/patch-mozilla-release_config_rules.mk (revision 485518) +++ head/www/cliqz/files/patch-mozilla-release_config_rules.mk (revision 485519) @@ -1,26 +1,26 @@ ---- mozilla-release/config/rules.mk.orig 2018-11-17 13:03:00 UTC +--- mozilla-release/config/rules.mk.orig 2018-11-16 08:40:07 UTC +++ mozilla-release/config/rules.mk -@@ -1223,20 +1223,20 @@ $(EXTENSIONS_PATH): +@@ -1302,20 +1302,20 @@ $(EXTENSIONS_PATH): CLIQZ_XPI_PATH = $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi $(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH) echo CLIQZ_XPI_PATH in `pwd` - wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) +# wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) HTTPSE_XPI_PATH = $(EXTENSIONS_PATH)/https-everywhere@cliqz.com.xpi $(HTTPSE_XPI_PATH): $(EXTENSIONS_PATH) ifdef HTTPSE_EXT_URL echo HTTPSE_XPI_PATH in `pwd` - wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) +# wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) endif CONSENTRICK_XPI_PATH = $(EXTENSIONS_PATH)/gdprtool@cliqz.com.xpi $(CONSENTRICK_XPI_PATH): $(EXTENSIONS_PATH) ifdef CONSENTRICK_EXT_URL echo CONSENTRICK_XPI_PATH in `pwd` - wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) +# wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) endif CLIQZ_ONIONMODE_XPI_PATH = $(EXTENSIONS_PATH)/onionmode@cliqz.com.xpi Index: head/www/cliqz/pkg-plist =================================================================== --- head/www/cliqz/pkg-plist (revision 485518) +++ head/www/cliqz/pkg-plist (revision 485519) @@ -1,55 +1,51 @@ bin/cliqz lib/cliqz/application.ini lib/cliqz/browser/adult-domains.bin lib/cliqz/browser/blocklist.xml lib/cliqz/browser/chrome.manifest lib/cliqz/browser/chrome/icons/default/default128.png lib/cliqz/browser/chrome/icons/default/default16.png lib/cliqz/browser/chrome/icons/default/default32.png lib/cliqz/browser/chrome/icons/default/default48.png lib/cliqz/browser/chrome/icons/default/default64.png lib/cliqz/browser/features/cliqz@cliqz.com.xpi lib/cliqz/browser/features/gdprtool@cliqz.com.xpi lib/cliqz/browser/features/https-everywhere@cliqz.com.xpi lib/cliqz/browser/omni.ja lib/cliqz/chrome.manifest lib/cliqz/cliqz lib/cliqz/cliqz-bin lib/cliqz/cliqz.cfg lib/cliqz/defaults/pref/channel-prefs.js lib/cliqz/dependentlibs.list lib/cliqz/gmp-clearkey/0.1/libclearkey.so lib/cliqz/gmp-clearkey/0.1/manifest.json lib/cliqz/gtk2/libmozgtk.so -lib/cliqz/icons/updater.png lib/cliqz/libfreebl3.chk lib/cliqz/libfreebl3.so lib/cliqz/liblgpllibs.so lib/cliqz/libmozavcodec.so lib/cliqz/libmozavutil.so lib/cliqz/libmozgtk.so lib/cliqz/libmozsqlite3.so lib/cliqz/libnspr4.so lib/cliqz/libnss3.so lib/cliqz/libnssckbi.so lib/cliqz/libnssdbm3.chk lib/cliqz/libnssdbm3.so lib/cliqz/libnssutil3.so lib/cliqz/libplc4.so lib/cliqz/libplds4.so lib/cliqz/libsmime3.so lib/cliqz/libsoftokn3.chk lib/cliqz/libsoftokn3.so lib/cliqz/libssl3.so lib/cliqz/libxul.so lib/cliqz/omni.ja lib/cliqz/pingsender lib/cliqz/platform.ini lib/cliqz/plugin-container lib/cliqz/precomplete lib/cliqz/removed-files -lib/cliqz/update-settings.ini -lib/cliqz/updater -lib/cliqz/updater.ini share/applications/cliqz.desktop share/pixmaps/cliqz.png