CRUX
Threads by month
- ----- 2024 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
February 2015
- 18 participants
- 30 discussions
Hi All,
Recently the CRUX Development Team has introduced a new
port into "core" ports of CRUX, a tool from Debian called
"start-stop-daemon". For whatever reason this tool was introduced
a) It was now discussed here and b) brought in new breaking changes.
I think it's important to discuss any major changes
that affect the architecture and user experience of CRUX
with the community.
Introducing start-stop-daemon and then changing
openssh's rc script (/etc/rc.d/ssh) to use /sbin/start-stop-daemon
and not listing start-stop-daemon IHMO is wrong.
But the Port guidelines say not to do this which I think
in this case is a bit silly or at least ambiguous.
So all this aside... Let's discuss what we can here...
Do we need to update our Polices? I think so.
Should we list run-time dependencies that are not linked
against? I definitely think so - otherwise you end up
with a potentially broken system.
Lastly, Why are we introducing (already have)
start-stop-daemon from Debian's ecosystem?
What are we trying to solve with this tool that
we can't otherwise solve in other ways or have
issues with certain softwared fixed upstream?
Your faithfully,
James Mills (a long time CRUX user)
James Mills / prologic
E: prologic(a)shortcircuit.net.au
W: prologic.shortcircuit.net.au
10
24
Hi,
I wonder if anyone works on e19 ports?
Thanks,
Wawrzek
--
Dr Wawrzyniec Niewodniczański or Wawrzek for short
PhD in Quantum Chemistry & MSc in Molecular Engineering
WWW: http://wawrzek.name E-MAIL: jobs(a)wawrzek.name
Linux User #177124
2
3
commit 98e1a057c86c110fb912b6f365514a3a2142e1c0
Author: Juergen Daubert <jue(a)jue.li>
Date: Sat Feb 28 12:29:14 2015 +0100
[notify] cups-filters: update to 1.0.66
- security fix, see
https://bugs.linuxfoundation.org/show_bug.cgi?id=1265
- new rc script
diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum
index 5edaef2..ae2b56f 100644
--- a/cups-filters/.md5sum
+++ b/cups-filters/.md5sum
@@ -1,3 +1,2 @@
-f182d7717ed0a939a4f50e572939afdd cups-browsed
-20dea125408bfebd25a58a884a78a13c cups-filters-1.0.65.tar.xz
-9bda1352feb57b1107be202f803d186b cups-filters-poppler_0.31.patch
+6ac0b4af2a1c70293588faf12a11b652 cups-browsed
+ad594ac06dfbfb02af34deb0805cab00 cups-filters-1.0.66.tar.xz
diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile
index 1e5a5cf..4b55d7d 100644
--- a/cups-filters/Pkgfile
+++ b/cups-filters/Pkgfile
@@ -4,16 +4,14 @@
# Depends on: cups ghostscript poppler qpdf
name=cups-filters
-version=1.0.65
-release=2
+version=1.0.66
+release=1
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
- cups-browsed cups-filters-poppler_0.31.patch)
+ cups-browsed)
build () {
cd $name-$version
- patch -p0 -i $SRC/$name-poppler_0.31.patch
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/man \
diff --git a/cups-filters/cups-browsed b/cups-filters/cups-browsed
index d18935e..22cd950 100755
--- a/cups-filters/cups-browsed
+++ b/cups-filters/cups-browsed
@@ -3,20 +3,32 @@
# /etc/rc.d/cups-browsed: start/stop CUPS browsing daemon
#
+SSD=/sbin/start-stop-daemon
+PROG=/usr/sbin/cups-browsed
+PID=/var/run/cups-browsed.pid
+
case $1 in
start)
- setsid /usr/sbin/cups-browsed &
+ $SSD --start -bm --pidfile $PID --exec $PROG
;;
stop)
- killall -q /usr/sbin/cups-browsed
+ $SSD --stop --remove-pidfile --retry 10 --pidfile $PID
;;
restart)
$0 stop
- sleep 2
$0 start
;;
+status)
+ $SSD --status --pidfile $PID
+ case $? in
+ 0) echo "$PROG is running" ;;
+ 1) echo "$PROG is not running but the pid file $PID exists" ;;
+ 3) echo "$PROG is not running" ;;
+ 4) echo "Unable to determine the program status" ;;
+ esac
+ ;;
*)
- echo "usage: $0 [start|stop]"
+ echo "usage: $0 [start|stop|restart|status]"
;;
esac
diff --git a/cups-filters/cups-filters-poppler_0.31.patch b/cups-filters/cups-filters-poppler_0.31.patch
deleted file mode 100644
index b582825..0000000
--- a/cups-filters/cups-filters-poppler_0.31.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-# https://bugs.linuxfoundation.org/show_bug.cgi?id=1254
-# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio…
-
-=== modified file 'NEWS'
---- NEWS 2015-02-14 00:35:53 +0000
-+++ NEWS 2015-02-18 03:17:28 +0000
-@@ -1,6 +1,12 @@
- NEWS - OpenPrinting CUPS Filters v1.0.65 - 2015-02-13
- -----------------------------------------------------
-
-+CHANGES IN V1.0.66
-+
-+ - pdftoopvp: Added conditionals to also build with Poppler 0.31.0
-+ and newer. Thanks to Armin K. (krejzi at email dot com) for the
-+ patch (Bug #1254).
-+
- CHANGES IN V1.0.65
-
- - cups-browsed: Listen for NetworkManager changes (Red Hat bug #975933).
-
-=== modified file 'filter/pdftoijs.cxx'
---- filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000
-+++ filter/pdftoijs.cxx 2015-02-18 03:17:28 +0000
-@@ -436,7 +436,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- reverseVideo,paperColor,gTrue,gFalse);
-+ reverseVideo,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
-
-=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
---- filter/pdftoopvp/OPVPOutputDev.cxx 2014-03-10 11:24:29 +0000
-+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000
-@@ -278,7 +278,11 @@
- gFalse,
- gFalse,
- #endif
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
- globalParams->getAntialias());
-+#else
-+ gFalse);
-+#endif
- for (i = 0; i < nT3Fonts; ++i) {
- delete t3FontCache[i];
- }
-
-=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
---- filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000
-+++ filter/pdftoopvp/pdftoopvp.cxx 2015-02-18 03:17:28 +0000
-@@ -614,7 +614,9 @@
- ok = gFalse;
- }
- }
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
- globalParams->setAntialias("no");
-+#endif
- if (quiet) {
- globalParams->setErrQuiet(quiet);
- }
-
-=== modified file 'filter/pdftoraster.cxx'
---- filter/pdftoraster.cxx 2014-09-26 18:46:49 +0000
-+++ filter/pdftoraster.cxx 2015-02-18 03:17:28 +0000
-@@ -2100,7 +2100,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- gFalse,paperColor,gTrue,gFalse);
-+ gFalse,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
-
1
0
25 Feb '15
commit 7f816f706afde1ef0b69db1b75bf2bf711dca4b9
Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve>
Date: Wed Feb 25 19:18:26 2015 +0900
[notify] samba: Updated to 4.1.17. Fixes CVE-2015-0240.
https://www.samba.org/samba/security/CVE-2015-0240
diff --git a/samba/.md5sum b/samba/.md5sum
index 0ffc416..fb0685c 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,5 +1,5 @@
e19e48b72077085b3e91b40382ccf4fa nmbd.rc
-9c3bc2fb98fd3bac9945b911c71fdc66 samba-4.1.16.tar.gz
+8fed0f23a672e6a8d0716d96aca88671 samba-4.1.17.tar.gz
84266d28273c12045e18ea34c504c296 samba.rc
14f80643ec7508794f5dfc5598daa667 smbd.rc
3449060f819db4be400399ca5d0708f5 winbindd.rc
diff --git a/samba/Pkgfile b/samba/Pkgfile
index ce73a65..36c14b9 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -6,7 +6,7 @@
# Optional: cups
name=samba
-version=4.1.16
+version=4.1.17
release=3
source=(
http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz
1
0
ports/contrib (3.1): [notify] thunderbird: updated to 31.5. Fixes several security issues.
by crux@crux.nu 25 Feb '15
by crux@crux.nu 25 Feb '15
25 Feb '15
commit 77ec5344489d5ae4eff755068fd7c310c520e002
Author: Fredrik Rinnestam <fredrik(a)crux.nu>
Date: Tue Feb 24 21:50:51 2015 +0100
[notify] thunderbird: updated to 31.5. Fixes several security issues.
https://www.mozilla.org/en-US/security/known-vulnerabilities/firefox/
diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum
index 9a6439d..95e8557 100644
--- a/thunderbird/.md5sum
+++ b/thunderbird/.md5sum
@@ -1,4 +1,4 @@
-da9c86271bb498c5feb02ce9c360669f thunderbird-31.4.0.source.tar.bz2
+3345496d6b463be8fd253911b9847ffb thunderbird-31.5.0.source.tar.bz2
681d36d1cfb52c9e6b8eda15d3b386ab thunderbird-install-dir.patch
87f8666f06ba8c3668e39068050bb77a thunderbird.desktop
d66c388b7d287520c098e9d9853ce4bb thunderbird_default48.png
diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index e13106b..62e7f6d 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: python gtk alsa-lib xorg-libxt libnotify libidl nss dbus-glib xorg-libxdamage yasm mesa3d libjpeg-turbo
name=thunderbird
-version=31.4.0
+version=31.5.0
release=1
source=(ftp://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$nam…
$name.desktop ${name}_default48.png thunderbird-install-dir.patch)
1
0
ports/opt (3.1): [notify] firefox: updated to 36.0. Fixes several security issues.
by crux@crux.nu 25 Feb '15
by crux@crux.nu 25 Feb '15
25 Feb '15
commit 58b26135680dbf5efd70dc1813bbd0cdc0bbe475
Author: Fredrik Rinnestam <fredrik(a)crux.nu>
Date: Tue Feb 24 20:57:32 2015 +0100
[notify] firefox: updated to 36.0. Fixes several security issues.
https://www.mozilla.org/en-US/security/known-vulnerabilities/firefox/
diff --git a/firefox/.footprint b/firefox/.footprint
index 5828ea8..757d73f 100644
--- a/firefox/.footprint
+++ b/firefox/.footprint
@@ -6,9 +6,11 @@ drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/firefox -> /usr/lib/firefox/firefox
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/firefox/
+-rw-r--r-- root/root usr/include/firefox/AVCCDecoderModule.h
-rw-r--r-- root/root usr/include/firefox/AbstractMediaDecoder.h
-rw-r--r-- root/root usr/include/firefox/AccEvent.h
-rw-r--r-- root/root usr/include/firefox/ActiveLayerTracker.h
+-rw-r--r-- root/root usr/include/firefox/AlreadyAddRefed.h
-rw-r--r-- root/root usr/include/firefox/AndroidNativeWindow.h
-rw-r--r-- root/root usr/include/firefox/AndroidSurfaceTexture.h
-rw-r--r-- root/root usr/include/firefox/AnimationCommon.h
@@ -53,10 +55,10 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/CodeAddressService.h
-rw-r--r-- root/root usr/include/firefox/Composer2D.h
-rw-r--r-- root/root usr/include/firefox/CompositableHost.h
--rw-r--r-- root/root usr/include/firefox/CompositorChild.h
--rw-r--r-- root/root usr/include/firefox/CompositorParent.h
+-rw-r--r-- root/root usr/include/firefox/CompositorTypes.h
-rw-r--r-- root/root usr/include/firefox/ContainerWriter.h
-rw-r--r-- root/root usr/include/firefox/ContentHelper.h
+-rw-r--r-- root/root usr/include/firefox/ContextStateTracker.h
-rw-r--r-- root/root usr/include/firefox/CopyableCanvasLayer.h
-rw-r--r-- root/root usr/include/firefox/CounterStyleManager.h
-rw-r--r-- root/root usr/include/firefox/Crypto.h
@@ -92,7 +94,6 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/FrameMetrics.h
-rw-r--r-- root/root usr/include/firefox/FramePropertyTable.h
-rw-r--r-- root/root usr/include/firefox/GLBlitHelper.h
--rw-r--r-- root/root usr/include/firefox/GLBlitTextureImageHelper.h
-rw-r--r-- root/root usr/include/firefox/GLConsts.h
-rw-r--r-- root/root usr/include/firefox/GLContext.h
-rw-r--r-- root/root usr/include/firefox/GLContextEGL.h
@@ -121,6 +122,7 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/GMPDecryptorParent.h
-rw-r--r-- root/root usr/include/firefox/GMPDecryptorProxy.h
-rw-r--r-- root/root usr/include/firefox/GMPEncryptedBufferDataImpl.h
+-rw-r--r-- root/root usr/include/firefox/GMPLoader.h
-rw-r--r-- root/root usr/include/firefox/GMPMessageUtils.h
-rw-r--r-- root/root usr/include/firefox/GMPParent.h
-rw-r--r-- root/root usr/include/firefox/GMPPlatform.h
@@ -159,6 +161,7 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/ICUUtils.h
-rw-r--r-- root/root usr/include/firefox/IJSDebugger.h
-rw-r--r-- root/root usr/include/firefox/IPeerConnection.h
+-rw-r--r-- root/root usr/include/firefox/IProgressObserver.h
-rw-r--r-- root/root usr/include/firefox/ImageContainer.h
-rw-r--r-- root/root usr/include/firefox/ImageHost.h
-rw-r--r-- root/root usr/include/firefox/ImageLayers.h
@@ -167,6 +170,7 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/ImageRegion.h
-rw-r--r-- root/root usr/include/firefox/ImageTypes.h
-rw-r--r-- root/root usr/include/firefox/InputData.h
+-rw-r--r-- root/root usr/include/firefox/IntelWebMVideoDecoder.h
-rw-r--r-- root/root usr/include/firefox/IrishCasing.h
-rw-r--r-- root/root usr/include/firefox/JSStreamWriter.h
-rw-r--r-- root/root usr/include/firefox/Latency.h
@@ -177,6 +181,7 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/LayerTreeInvalidation.h
-rw-r--r-- root/root usr/include/firefox/Layers.h
-rw-r--r-- root/root usr/include/firefox/LayersLogging.h
+-rw-r--r-- root/root usr/include/firefox/LayersTypes.h
-rw-r--r-- root/root usr/include/firefox/LoadManager.h
-rw-r--r-- root/root usr/include/firefox/LoadManagerFactory.h
-rw-r--r-- root/root usr/include/firefox/LoadMonitor.h
@@ -184,11 +189,11 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/MP3FrameParser.h
-rw-r--r-- root/root usr/include/firefox/MP4Decoder.h
-rw-r--r-- root/root usr/include/firefox/MP4Reader.h
+-rw-r--r-- root/root usr/include/firefox/MP4Stream.h
-rw-r--r-- root/root usr/include/firefox/MainThreadUtils.h
-rw-r--r-- root/root usr/include/firefox/MediaBufferDecoder.h
-rw-r--r-- root/root usr/include/firefox/MediaCache.h
-rw-r--r-- root/root usr/include/firefox/MediaData.h
--rw-r--r-- root/root usr/include/firefox/MediaDataDecodedListener.h
-rw-r--r-- root/root usr/include/firefox/MediaDecoder.h
-rw-r--r-- root/root usr/include/firefox/MediaDecoderOwner.h
-rw-r--r-- root/root usr/include/firefox/MediaDecoderReader.h
@@ -200,11 +205,13 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/MediaEngineWebRTC.h
-rw-r--r-- root/root usr/include/firefox/MediaInfo.h
-rw-r--r-- root/root usr/include/firefox/MediaMetadataManager.h
+-rw-r--r-- root/root usr/include/firefox/MediaPromise.h
-rw-r--r-- root/root usr/include/firefox/MediaQueue.h
-rw-r--r-- root/root usr/include/firefox/MediaRecorder.h
-rw-r--r-- root/root usr/include/firefox/MediaResource.h
-rw-r--r-- root/root usr/include/firefox/MediaSegment.h
-rw-r--r-- root/root usr/include/firefox/MediaSourceDecoder.h
+-rw-r--r-- root/root usr/include/firefox/MediaSourceReader.h
-rw-r--r-- root/root usr/include/firefox/MediaStreamGraph.h
-rw-r--r-- root/root usr/include/firefox/MediaTaskQueue.h
-rw-r--r-- root/root usr/include/firefox/MediaTrack.h
@@ -222,8 +229,10 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/OpusTrackEncoder.h
-rw-r--r-- root/root usr/include/firefox/Orientation.h
-rw-r--r-- root/root usr/include/firefox/PlatformDecoderModule.h
+-rw-r--r-- root/root usr/include/firefox/PluginWidgetProxy.h
-rw-r--r-- root/root usr/include/firefox/ProfilerMarkers.h
-rw-r--r-- root/root usr/include/firefox/PseudoStack.h
+-rw-r--r-- root/root usr/include/firefox/PuppetWidget.h
-rw-r--r-- root/root usr/include/firefox/RawDecoder.h
-rw-r--r-- root/root usr/include/firefox/RawReader.h
-rw-r--r-- root/root usr/include/firefox/RawStructs.h
@@ -242,19 +251,19 @@ drwxr-xr-x root/root usr/include/firefox/
-rw-r--r-- root/root usr/include/firefox/Selection.h
-rw-r--r-- root/root usr/include/firefox/SelfRef.h
-rw-r--r-- root/root usr/include/firefox/SerializedLoadContext.h
--rw-r--r-- root/root usr/include/firefox/ShadowLayersManager.h
-rw-r--r-- root/root usr/include/firefox/SharedBuffer.h
-rw-r--r-- root/root usr/include/firefox/SharedCertVerifier.h
+-rw-r--r-- root/root usr/include/firefox/SharedDecoderManager.h
-rw-r--r-- root/root usr/include/firefox/SharedSurface.h
-rw-r--r-- root/root usr/include/firefox/SharedSurfaceEGL.h
-rw-r--r-- root/root usr/include/firefox/SharedSurfaceGL.h
-rw-r--r-- root/root usr/include/firefox/SharedThreadPool.h
-rwxr-xr-x root/root usr/include/firefox/SkiaGLGlue.h
+-rw-r--r-- root/root usr/include/firefox/SoftwareWebMVideoDecoder.h
-rw-r--r-- root/root usr/include/firefox/SpecialSystemDirectory.h
-rw-r--r-- root/root usr/include/firefox/StackArena.h
-rw-r--r-- root/root usr/include/firefox/StreamBuffer.h
-rw-r--r-- root/root usr/include/firefox/SurfaceCache.h
--rw-r--r-- root/root usr/include/firefox/SurfaceStream.h
-rw-r--r-- root/root usr/include/firefox/SurfaceTypes.h
-rw-r--r-- root/root usr/include/firefox/TextureGarbageBin.h
-rw-r--r-- root/root usr/include/firefox/TexturePoolOGL.h
@@ -357,6 +366,7 @@ drwxr-xr-x root/root usr/include/firefox/cubeb/
-rw-r--r-- root/root usr/include/firefox/gfxTypes.h
-rw-r--r-- root/root usr/include/firefox/gfxUserFontSet.h
-rw-r--r-- root/root usr/include/firefox/gfxUtils.h
+-rw-r--r-- root/root usr/include/firefox/gfxVR.h
-rw-r--r-- root/root usr/include/firefox/gfxXlibNativeRenderer.h
-rw-r--r-- root/root usr/include/firefox/gfxXlibSurface.h
drwxr-xr-x root/root usr/include/firefox/gfxipc/
@@ -469,7 +479,6 @@ drwxr-xr-x root/root usr/include/firefox/js/
-rw-r--r-- root/root usr/include/firefox/js/Principals.h
-rw-r--r-- root/root usr/include/firefox/js/ProfilingFrameIterator.h
-rw-r--r-- root/root usr/include/firefox/js/ProfilingStack.h
--rw-r--r-- root/root usr/include/firefox/js/PropertyKey.h
-rw-r--r-- root/root usr/include/firefox/js/RequiredDefines.h
-rw-r--r-- root/root usr/include/firefox/js/RootingAPI.h
-rw-r--r-- root/root usr/include/firefox/js/SliceBudget.h
@@ -601,6 +610,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/
-rw-r--r-- root/root usr/include/firefox/mozilla/EnumSet.h
-rw-r--r-- root/root usr/include/firefox/mozilla/EnumeratedArray.h
-rw-r--r-- root/root usr/include/firefox/mozilla/EnumeratedArrayCycleCollection.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/ErrorNames.h
-rw-r--r-- root/root usr/include/firefox/mozilla/ErrorResult.h
-rw-r--r-- root/root usr/include/firefox/mozilla/EventClassList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/EventDispatcher.h
@@ -699,6 +709,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/
-rw-r--r-- root/root usr/include/firefox/mozilla/SHA1.h
-rw-r--r-- root/root usr/include/firefox/mozilla/SSE.h
-rw-r--r-- root/root usr/include/firefox/mozilla/Sandbox.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/SandboxInfo.h
-rw-r--r-- root/root usr/include/firefox/mozilla/Scoped.h
-rw-r--r-- root/root usr/include/firefox/mozilla/ServiceList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/Services.h
@@ -733,6 +744,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/
-rw-r--r-- root/root usr/include/firefox/mozilla/VirtualKeyCodeList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/VisualEventTracer.h
-rw-r--r-- root/root usr/include/firefox/mozilla/VolatileBuffer.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/VsyncDispatcher.h
-rw-r--r-- root/root usr/include/firefox/mozilla/WeakPtr.h
-rw-r--r-- root/root usr/include/firefox/mozilla/WidgetTraceEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/WidgetUtils.h
@@ -745,11 +757,14 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/a11y/
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/Accessible.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/AccessibleWrap.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/DocAccessible.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/DocAccessibleChild.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/DocAccessibleParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/DocManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/FocusManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/HyperTextAccessible.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/HyperTextAccessibleWrap.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/Platform.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/ProxyAccessible.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/RelationType.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/Role.h
-rw-r--r-- root/root usr/include/firefox/mozilla/a11y/SelectionManager.h
@@ -794,6 +809,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AnimationPlayerBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AnimationTimeline.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AnimationTimelineBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AnonymousContent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AnonymousContentBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AppInfoBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AppNotificationServiceOptionsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/AppsBinding.h
@@ -832,6 +849,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BarPropBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BarProps.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BatteryManagerBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BeforeAfterKeyboardEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BeforeAfterKeyboardEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BeforeUnloadEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BeforeUnloadEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BindingDeclarations.h
@@ -842,6 +861,9 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BlobEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BlobEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BlobSet.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BoxObjectBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BrowserElementBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BrowserElementDictionariesBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/BrowserFeedWriterBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CDATASection.h
@@ -873,6 +895,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CallsList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CallsListBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraCapabilitiesBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraClosedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraClosedEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraConfigurationEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraConfigurationEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CameraControlBinding.h
@@ -912,11 +936,14 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ConsoleBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ConstraintsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContactsBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContainerBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContainerBoxObjectBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentBridgeChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentBridgeParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentProcess.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ContentProcessManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ConvolverNode.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ConvolverNodeBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/CoordinatesBinding.h
@@ -1034,10 +1061,12 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ExternalHelperAppChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ExternalHelperAppParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FakeSpeechRecognitionService.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FakeTVService.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FallbackEncoding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FeatureList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/Fetch.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FetchBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FetchDriver.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/File.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FileBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/FileHandle.h
@@ -1147,7 +1176,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLLinkElementBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMapElement.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMapElementBinding.h
--rwxr-xr-x root/root usr/include/firefox/mozilla/dom/HTMLMediaElement.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMediaElement.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMediaElementBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMenuElement.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/HTMLMenuElementBinding.h
@@ -1266,7 +1295,9 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InterAppConnectionBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InterAppConnectionRequestBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InterAppMessagePortBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InternalHeaders.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InternalRequest.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/InternalResponse.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/JSSlots.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/KeyAlgorithmBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/KeyAlgorithmProxy.h
@@ -1276,8 +1307,14 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/LegacyQueryInterfaceBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/Link.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/LinkStyleBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ListBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ListBoxObjectBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/LocalMediaStreamBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/LocationBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MMICall.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MMICallBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaDevices.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaDevicesBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaElementAudioSourceNode.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaElementAudioSourceNodeBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaEncryptedEvent.h
@@ -1290,6 +1327,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeyMessageEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeySession.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeySessionBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeySystemAccess.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeySystemAccessBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeys.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaKeysBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaListBinding.h
@@ -1303,6 +1342,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamAudioSourceNode.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamAudioSourceNodeBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamError.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamErrorBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamListBinding.h
@@ -1311,6 +1352,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamTrackEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaStreamTrackEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MediaTrackConstraintSetBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MenuBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MenuBoxObjectBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MessageChannel.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MessageChannelBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/MessageEvent.h
@@ -1437,12 +1480,16 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PhoneNumberServiceBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PluginArrayBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PluginBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PluginCrashedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PluginCrashedEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PointerEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PointerEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopStateEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopStateEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopupBlockedEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopupBlockedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopupBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PopupBoxObjectBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PositionBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PositionErrorBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/PowerManager.h
@@ -1489,6 +1536,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/RegisterWorkerBindings.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/Request.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/RequestBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ResolveSystemBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ResourceStatsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ResourceStatsManagerBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/Response.h
@@ -1694,6 +1742,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScriptSettings.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollAreaEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollAreaEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollBoxObjectBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollViewChangeEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ScrollViewChangeEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/Selection.h
@@ -1701,6 +1751,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/SelectionChangeEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/SelectionChangeEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerClientBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerClientsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerCommon.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerContainer.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ServiceWorkerContainerBinding.h
@@ -1766,6 +1818,30 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/StyleSheetListBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/SubtleCrypto.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/SubtleCryptoBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVChannel.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVChannelBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVCurrentChannelChangedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVCurrentChannelChangedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVCurrentSourceChangedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVCurrentSourceChangedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVEITBroadcastedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVEITBroadcastedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVListeners.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVManager.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVManagerBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVProgram.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVProgramBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVScanningStateChangedEvent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVScanningStateChangedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVServiceCallbacks.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVServiceFactory.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVServiceRunnables.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVSource.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVSourceBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVTuner.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVTunerBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVTypes.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TVUtils.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TabChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TabContext.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TabMessageUtils.h
@@ -1808,6 +1884,9 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TrackEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TransitionEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TransitionEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeBoxObject.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeBoxObjectBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeColumnBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeColumnsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeWalker.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/TreeWalkerBinding.h
@@ -1826,6 +1905,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/URLUtilsReadOnlyBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/USSDReceivedEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/USSDReceivedEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/USSDSession.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/USSDSessionBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UndoManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UndoManagerBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UnionConversions.h
@@ -1833,6 +1914,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UnionTypes.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UserProximityEvent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/UserProximityEventBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/VRDevice.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/VRDeviceBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/VTTCueBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/VTTRegionBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ValidityState.h
@@ -1862,6 +1945,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WheelEventBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WifiOptionsBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WindowBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WindowRootBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WorkerBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WorkerGlobalScopeBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/WorkerLocationBinding.h
@@ -1882,6 +1966,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathEvaluatorBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathExpression.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathExpressionBinding.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathNSResolverBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathResult.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XPathResultBinding.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/XSLTProcessorBinding.h
@@ -1942,6 +2027,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/indexedDB/
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/ipc/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ipc/BlobChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ipc/BlobParent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ipc/IdType.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/ipc/nsIRemoteBlob.h
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/mobileconnection/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/mobileconnection/MobileCallForwardingOptions.h
@@ -1963,8 +2049,13 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/network/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/network/Types.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/network/UDPSocketChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/network/UDPSocketParent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsBrowserElement.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsCSPContext.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsCSPService.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsCSPUtils.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsIContentChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsIContentParent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsMixedContentBlocker.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsSVGAnimatedTransformList.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsSpeechTask.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/nsSynthVoiceRegistry.h
@@ -1982,13 +2073,13 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/quota/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/QuotaCommon.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/QuotaManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/QuotaObject.h
--rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/StoragePrivilege.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/UsageInfo.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/quota/Utilities.h
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/telephony/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/telephony/TelephonyCallback.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/telephony/TelephonyChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/telephony/TelephonyCommon.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/telephony/TelephonyDialCallback.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/telephony/TelephonyParent.h
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/time/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/time/DateCacheCleaner.h
@@ -2001,6 +2092,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/voicemail/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/voicemail/VoicemailParent.h
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/workers/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/ServiceWorkerManager.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/WorkerDebuggerManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/Workers.h
drwxr-xr-x root/root usr/include/firefox/mozilla/dom/workers/bindings/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/DataStore.h
@@ -2011,12 +2103,17 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/dom/workers/bindings/
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/Navigator.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/Performance.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/ServiceWorker.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/ServiceWorkerClient.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/ServiceWorkerClients.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/SharedWorker.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/URL.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/WorkerFeature.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/XMLHttpRequest.h
-rw-r--r-- root/root usr/include/firefox/mozilla/dom/workers/bindings/XMLHttpRequestUpload.h
-rw-r--r-- root/root usr/include/firefox/mozilla/double-conversion.h
+drwxr-xr-x root/root usr/include/firefox/mozilla/embedding/
+drwxr-xr-x root/root usr/include/firefox/mozilla/embedding/printingui/
+-rw-r--r-- root/root usr/include/firefox/mozilla/embedding/printingui/PrintingParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/fallible.h
drwxr-xr-x root/root usr/include/firefox/mozilla/gfx/
-rw-r--r-- root/root usr/include/firefox/mozilla/gfx/2D.h
@@ -2086,10 +2183,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/layers/
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/APZTestData.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/ActiveElementManager.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/AsyncCompositionManager.h
--rw-r--r-- root/root usr/include/firefox/mozilla/layers/AsyncPanZoomController.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/AsyncTransactionTracker.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/AtomicRefCountedWithFinalize.h
--rw-r--r-- root/root usr/include/firefox/mozilla/layers/Axis.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/AxisPhysicsMSDModel.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/AxisPhysicsModel.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/BasicCompositor.h
@@ -2112,7 +2207,6 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/layers/
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/Effects.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/FenceUtils.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/GeckoContentController.h
--rw-r--r-- root/root usr/include/firefox/mozilla/layers/GestureEventListener.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/GrallocTextureClient.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/GrallocTextureHost.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/ISurfaceAllocator.h
@@ -2139,10 +2233,10 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/layers/
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/SharedBufferManagerParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/SharedPlanarYCbCrImage.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/SharedRGBImage.h
--rw-r--r-- root/root usr/include/firefox/mozilla/layers/TaskThrottler.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureClient.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureClientOGL.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureClientPool.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureClientRecycleAllocator.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureClientX11.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureHost.h
-rw-r--r-- root/root usr/include/firefox/mozilla/layers/TextureHostBasic.h
@@ -2193,6 +2287,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/net/
-rw-r--r-- root/root usr/include/firefox/mozilla/net/PDNSParams.h
-rw-r--r-- root/root usr/include/firefox/mozilla/net/PHttpChannelParams.h
-rw-r--r-- root/root usr/include/firefox/mozilla/net/PSpdyPush.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/net/ReferrerPolicy.h
-rw-r--r-- root/root usr/include/firefox/mozilla/net/RemoteOpenFileChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/net/RemoteOpenFileParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/net/TimingStruct.h
@@ -2216,8 +2311,7 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/plugins/
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/NPEventOSX.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/NPEventUnix.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/NPEventWindows.h
--rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginIdentifierChild.h
--rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginIdentifierParent.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginBridge.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginInstanceChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginInstanceParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginMessageUtils.h
@@ -2232,6 +2326,8 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/plugins/
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginStreamChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginStreamParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginUtilsOSX.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginWidgetChild.h
+-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/PluginWidgetParent.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/ScopedMethodFactory.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/StreamNotifyChild.h
-rw-r--r-- root/root usr/include/firefox/mozilla/plugins/StreamNotifyParent.h
@@ -2253,9 +2349,12 @@ drwxr-xr-x root/root usr/include/firefox/mozilla/threads/
drwxr-xr-x root/root usr/include/firefox/mp4_demuxer/
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/Adts.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/AnnexB.h
+-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/AtomType.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/BufferStream.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/ByteReader.h
+-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/ByteWriter.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/DecoderData.h
+-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/H264.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/Interval.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/MoofParser.h
-rw-r--r-- root/root usr/include/firefox/mp4_demuxer/mp4_demuxer.h
@@ -2316,6 +2415,8 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsAutoPtr.h
-rw-r--r-- root/root usr/include/firefox/nsAutoRef.h
-rw-r--r-- root/root usr/include/firefox/nsBaseHashtable.h
+-rw-r--r-- root/root usr/include/firefox/nsBaseScreen.h
+-rw-r--r-- root/root usr/include/firefox/nsBaseWidget.h
-rw-r--r-- root/root usr/include/firefox/nsBidi.h
-rw-r--r-- root/root usr/include/firefox/nsBidiPresUtils.h
-rw-r--r-- root/root usr/include/firefox/nsBidiUtils.h
@@ -2341,6 +2442,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsCSSPropAliasList.h
-rw-r--r-- root/root usr/include/firefox/nsCSSPropList.h
-rw-r--r-- root/root usr/include/firefox/nsCSSProperty.h
+-rw-r--r-- root/root usr/include/firefox/nsCSSPropertySet.h
-rw-r--r-- root/root usr/include/firefox/nsCSSProps.h
-rw-r--r-- root/root usr/include/firefox/nsCSSPseudoClassList.h
-rw-r--r-- root/root usr/include/firefox/nsCSSPseudoClasses.h
@@ -2360,7 +2462,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsCategoryCache.h
-rw-r--r-- root/root usr/include/firefox/nsCategoryManagerUtils.h
-rw-r--r-- root/root usr/include/firefox/nsChangeHint.h
--rw-r--r-- root/root usr/include/firefox/nsChannelProperties.h
-rw-r--r-- root/root usr/include/firefox/nsCharSeparatedTokenizer.h
-rw-r--r-- root/root usr/include/firefox/nsCharTraits.h
-rw-r--r-- root/root usr/include/firefox/nsCharsetSource.h
@@ -2470,6 +2571,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsGenericHTMLElement.h
-rw-r--r-- root/root usr/include/firefox/nsGeoPosition.h
-rw-r--r-- root/root usr/include/firefox/nsGeoPositionIPCSerialiser.h
+-rw-r--r-- root/root usr/include/firefox/nsGeolocationSettings.h
-rw-r--r-- root/root usr/include/firefox/nsGfxCIID.h
-rw-r--r-- root/root usr/include/firefox/nsGkAtomList.h
-rw-r--r-- root/root usr/include/firefox/nsGkAtoms.h
@@ -2615,6 +2717,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsIBrowserBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsIBrowserDOMWindow.h
+-rw-r--r-- root/root usr/include/firefox/nsIBrowserElementAPI.h
-rw-r--r-- root/root usr/include/firefox/nsIBrowserGlue.h
-rw-r--r-- root/root usr/include/firefox/nsIBrowserHandler.h
-rw-r--r-- root/root usr/include/firefox/nsIBrowserHistory.h
@@ -2655,7 +2758,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsICertificateDialogs.h
-rw-r--r-- root/root usr/include/firefox/nsIChannel.h
-rw-r--r-- root/root usr/include/firefox/nsIChannelEventSink.h
--rw-r--r-- root/root usr/include/firefox/nsIChannelPolicy.h
-rw-r--r-- root/root usr/include/firefox/nsICharsetDetectionObserver.h
-rw-r--r-- root/root usr/include/firefox/nsICharsetDetector.h
-rw-r--r-- root/root usr/include/firefox/nsIChildChannel.h
@@ -2806,7 +2908,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIDOMGeoPositionCoords.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMGeoPositionError.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMGeoPositionErrorCallback.h
--rw-r--r-- root/root usr/include/firefox/nsIDOMGlobalObjectConstructor.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMGlobalPropertyInitializer.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMHTMLAnchorElement.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMHTMLAppletElement.h
@@ -2922,7 +3023,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIDOMWindowUtils.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMXMLDocument.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMXPathEvaluator.h
--rw-r--r-- root/root usr/include/firefox/nsIDOMXPathNSResolver.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMXPathResult.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMXULButtonElement.h
-rw-r--r-- root/root usr/include/firefox/nsIDOMXULCheckboxElement.h
@@ -2990,7 +3090,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIEditActionListener.h
-rw-r--r-- root/root usr/include/firefox/nsIEditingSession.h
-rw-r--r-- root/root usr/include/firefox/nsIEditor.h
--rw-r--r-- root/root usr/include/firefox/nsIEditorBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsIEditorIMESupport.h
-rw-r--r-- root/root usr/include/firefox/nsIEditorMailSupport.h
-rw-r--r-- root/root usr/include/firefox/nsIEditorObserver.h
@@ -3098,9 +3197,9 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIHttpEventSink.h
-rw-r--r-- root/root usr/include/firefox/nsIHttpHeaderVisitor.h
-rw-r--r-- root/root usr/include/firefox/nsIHttpProtocolHandler.h
+-rw-r--r-- root/root usr/include/firefox/nsIHttpPushListener.h
-rw-r--r-- root/root usr/include/firefox/nsIID.h
-rw-r--r-- root/root usr/include/firefox/nsIIDNService.h
--rw-r--r-- root/root usr/include/firefox/nsIIFrameBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsIIMEPicker.h
-rw-r--r-- root/root usr/include/firefox/nsIINIParser.h
-rw-r--r-- root/root usr/include/firefox/nsIIOService.h
@@ -3135,7 +3234,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIJARProtocolHandler.h
-rw-r--r-- root/root usr/include/firefox/nsIJARURI.h
-rw-r--r-- root/root usr/include/firefox/nsIJSInspector.h
--rw-r--r-- root/root usr/include/firefox/nsIJSNativeInitializer.h
-rw-r--r-- root/root usr/include/firefox/nsIJSON.h
-rw-r--r-- root/root usr/include/firefox/nsIJSRuntimeService.h
-rw-r--r-- root/root usr/include/firefox/nsIKeyModule.h
@@ -3212,6 +3310,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsINestedURI.h
-rw-r--r-- root/root usr/include/firefox/nsINetAddr.h
-rw-r--r-- root/root usr/include/firefox/nsINetUtil.h
+-rw-r--r-- root/root usr/include/firefox/nsINetworkInterceptController.h
-rw-r--r-- root/root usr/include/firefox/nsINetworkLinkService.h
-rw-r--r-- root/root usr/include/firefox/nsINetworkPredictor.h
-rw-r--r-- root/root usr/include/firefox/nsINetworkPredictorVerifier.h
@@ -3260,7 +3359,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIPluginInstanceOwner.h
-rw-r--r-- root/root usr/include/firefox/nsIPluginTag.h
-rw-r--r-- root/root usr/include/firefox/nsIPluginWidget.h
--rw-r--r-- root/root usr/include/firefox/nsIPopupBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsIPopupWindowManager.h
-rw-r--r-- root/root usr/include/firefox/nsIPowerManagerService.h
-rw-r--r-- root/root usr/include/firefox/nsIPrefBranch.h
@@ -3344,6 +3442,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIRelativeFilePref.h
-rw-r--r-- root/root usr/include/firefox/nsIRemoteOpenFileListener.h
-rw-r--r-- root/root usr/include/firefox/nsIRemoteService.h
+-rw-r--r-- root/root usr/include/firefox/nsIRemoteTagService.h
-rw-r--r-- root/root usr/include/firefox/nsIRequest.h
-rw-r--r-- root/root usr/include/firefox/nsIRequestObserver.h
-rw-r--r-- root/root usr/include/firefox/nsIRequestObserverProxy.h
@@ -3487,6 +3586,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsITCPSocketChild.h
-rw-r--r-- root/root usr/include/firefox/nsITCPSocketParent.h
-rw-r--r-- root/root usr/include/firefox/nsITLSServerSocket.h
+-rw-r--r-- root/root usr/include/firefox/nsITVService.h
-rw-r--r-- root/root usr/include/firefox/nsITXTToHTMLConv.h
-rw-r--r-- root/root usr/include/firefox/nsITabChild.h
-rw-r--r-- root/root usr/include/firefox/nsITabParent.h
@@ -3614,6 +3714,8 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsIWindowProvider.h
-rw-r--r-- root/root usr/include/firefox/nsIWindowWatcher.h
-rw-r--r-- root/root usr/include/firefox/nsIWordBreaker.h
+-rw-r--r-- root/root usr/include/firefox/nsIWorkerDebugger.h
+-rw-r--r-- root/root usr/include/firefox/nsIWorkerDebuggerManager.h
-rw-r--r-- root/root usr/include/firefox/nsIWritablePropertyBag.h
-rw-r--r-- root/root usr/include/firefox/nsIWritablePropertyBag2.h
-rw-r--r-- root/root usr/include/firefox/nsIWyciwygChannel.h
@@ -3686,7 +3788,6 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsNameSpaceManager.h
-rw-r--r-- root/root usr/include/firefox/nsNativeCharsetUtils.h
-rw-r--r-- root/root usr/include/firefox/nsNetCID.h
--rw-r--r-- root/root usr/include/firefox/nsNetStrings.h
-rw-r--r-- root/root usr/include/firefox/nsNetUtil.h
-rw-r--r-- root/root usr/include/firefox/nsNodeInfoManager.h
-rw-r--r-- root/root usr/include/firefox/nsNodeUtils.h
@@ -3698,6 +3799,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsPIDNSService.h
-rw-r--r-- root/root usr/include/firefox/nsPIDOMWindow.h
-rw-r--r-- root/root usr/include/firefox/nsPIEditorTransaction.h
+-rw-r--r-- root/root usr/include/firefox/nsPIListBoxObject.h
-rw-r--r-- root/root usr/include/firefox/nsPILoadGroupInternal.h
-rw-r--r-- root/root usr/include/firefox/nsPIPlacesDatabase.h
-rw-r--r-- root/root usr/include/firefox/nsPIPlacesHistoryListenersNotifier.h
@@ -3716,6 +3818,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsPluginInstanceOwner.h
-rw-r--r-- root/root usr/include/firefox/nsPluginLogging.h
-rw-r--r-- root/root usr/include/firefox/nsPluginNativeWindow.h
+-rw-r--r-- root/root usr/include/firefox/nsPluginNativeWindowGtk.h
-rw-r--r-- root/root usr/include/firefox/nsPluginPlayPreviewInfo.h
-rw-r--r-- root/root usr/include/firefox/nsPluginTags.h
-rw-r--r-- root/root usr/include/firefox/nsPluginsCID.h
@@ -3725,6 +3828,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsPresArena.h
-rw-r--r-- root/root usr/include/firefox/nsPresContext.h
-rw-r--r-- root/root usr/include/firefox/nsPresState.h
+-rw-r--r-- root/root usr/include/firefox/nsPrintOptionsImpl.h
-rw-r--r-- root/root usr/include/firefox/nsPrintfCString.h
-rw-r--r-- root/root usr/include/firefox/nsProcess.h
-rw-r--r-- root/root usr/include/firefox/nsProfileDirServiceProvider.h
@@ -3857,6 +3961,7 @@ drwxr-xr-x root/root usr/include/firefox/nestegg/
-rw-r--r-- root/root usr/include/firefox/nsTransform2D.h
-rw-r--r-- root/root usr/include/firefox/nsTraversal.h
-rw-r--r-- root/root usr/include/firefox/nsTreeColFrame.h
+-rw-r--r-- root/root usr/include/firefox/nsTreeColumns.h
-rw-r--r-- root/root usr/include/firefox/nsTreeSanitizer.h
-rw-r--r-- root/root usr/include/firefox/nsTreeUtils.h
-rw-r--r-- root/root usr/include/firefox/nsUCSupport.h
@@ -4247,7 +4352,6 @@ drwxr-xr-x root/root usr/include/firefox/speex/
-rw-r--r-- root/root usr/include/firefox/string-template-undef.h
drwxr-xr-x root/root usr/include/firefox/theora/
-rw-r--r-- root/root usr/include/firefox/theora/codec.h
--rw-r--r-- root/root usr/include/firefox/theora/theora.h
-rw-r--r-- root/root usr/include/firefox/theora/theoradec.h
-rw-r--r-- root/root usr/include/firefox/theora/theoraenc.h
-rw-r--r-- root/root usr/include/firefox/txIEXSLTRegExFunctions.h
@@ -4268,6 +4372,7 @@ drwxr-xr-x root/root usr/include/firefox/vpx/
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_codec.h
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_decoder.h
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_encoder.h
+-rw-r--r-- root/root usr/include/firefox/vpx/vpx_frame_buffer.h
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_image.h
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_integer.h
-rw-r--r-- root/root usr/include/firefox/vpx/vpx_mem.h
@@ -4277,12 +4382,6 @@ drwxr-xr-x root/root usr/include/firefox/vpx/
-rw-r--r-- root/root usr/include/firefox/vpx/x86.h
-rw-r--r-- root/root usr/include/firefox/vpx/yv12config.h
-rw-r--r-- root/root usr/include/firefox/xpcAccEvents.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessible.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessibleDocument.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessibleHyperLink.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessibleHyperText.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessibleSelectable.h
--rw-r--r-- root/root usr/include/firefox/xpcAccessibleValue.h
-rw-r--r-- root/root usr/include/firefox/xpcIJSGetFactory.h
-rw-r--r-- root/root usr/include/firefox/xpcIJSModuleLoader.h
-rw-r--r-- root/root usr/include/firefox/xpcIJSWeakReference.h
@@ -4378,10 +4477,12 @@ drwxr-xr-x root/root usr/lib/firefox/dictionaries/
-rw-r--r-- root/root usr/lib/firefox/dictionaries/en-US.dic
-rwxr-xr-x root/root usr/lib/firefox/firefox
-rwxr-xr-x root/root usr/lib/firefox/firefox-bin
+drwxr-xr-x root/root usr/lib/firefox/gmp-clearkey/
+drwxr-xr-x root/root usr/lib/firefox/gmp-clearkey/0.1/
+-rw-r--r-- root/root usr/lib/firefox/gmp-clearkey/0.1/clearkey.info
+-rwxr-xr-x root/root usr/lib/firefox/gmp-clearkey/0.1/libclearkey.so
-rwxr-xr-x root/root usr/lib/firefox/libmozalloc.so
--rwxr-xr-x root/root usr/lib/firefox/libmozsandbox.so
-rwxr-xr-x root/root usr/lib/firefox/libxul.so
--rwxr-xr-x root/root usr/lib/firefox/mozilla-xremote-client
-rw-r--r-- root/root usr/lib/firefox/omni.ja
-rw-r--r-- root/root usr/lib/firefox/platform.ini
-rwxr-xr-x root/root usr/lib/firefox/plugin-container
@@ -4547,6 +4648,7 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIBoxObject.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserBoxObject.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserDOMWindow.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserElementAPI.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserGlue.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserHandler.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIBrowserHistory.idl
@@ -4580,7 +4682,6 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsICertificateDialogs.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIChannel.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIChannelEventSink.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIChannelPolicy.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIChildChannel.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIChromeRegistry.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIClassInfo.idl
@@ -4718,7 +4819,6 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMGeoPositionCoords.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMGeoPositionError.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMGeoPositionErrorCallback.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIDOMGlobalObjectConstructor.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMGlobalPropertyInitializer.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMHTMLAnchorElement.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMHTMLAppletElement.idl
@@ -4833,7 +4933,6 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMWindowUtils.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXMLDocument.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXPathEvaluator.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXPathNSResolver.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXPathResult.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXULButtonElement.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIDOMXULCheckboxElement.idl
@@ -4893,7 +4992,6 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditActionListener.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditingSession.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditor.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIEditorBoxObject.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditorIMESupport.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditorMailSupport.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIEditorObserver.idl
@@ -4987,8 +5085,8 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIHttpEventSink.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIHttpHeaderVisitor.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIHttpProtocolHandler.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsIHttpPushListener.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIIDNService.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIIFrameBoxObject.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIIMEPicker.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIINIParser.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIIOService.idl
@@ -5083,6 +5181,7 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsINestedURI.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsINetAddr.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsINetUtil.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsINetworkInterceptController.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsINetworkLinkService.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsINetworkPredictor.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsINetworkPredictorVerifier.idl
@@ -5121,7 +5220,6 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIPluginInputStream.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIPluginInstanceOwner.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIPluginTag.idl
--rw-r--r-- root/root usr/share/idl/firefox/nsIPopupBoxObject.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIPopupWindowManager.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIPowerManagerService.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIPrefBranch.idl
@@ -5199,6 +5297,7 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIRelativeFilePref.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIRemoteOpenFileListener.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIRemoteService.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsIRemoteTagService.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIRequest.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIRequestObserver.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIRequestObserverProxy.idl
@@ -5316,6 +5415,7 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsITCPSocketChild.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsITCPSocketParent.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsITLSServerSocket.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsITVService.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsITXTToHTMLConv.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsITabChild.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsITabParent.idl
@@ -5428,6 +5528,8 @@ drwxr-xr-x root/root usr/share/idl/firefox/
-rw-r--r-- root/root usr/share/idl/firefox/nsIWindowMediatorListener.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIWindowProvider.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIWindowWatcher.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsIWorkerDebugger.idl
+-rw-r--r-- root/root usr/share/idl/firefox/nsIWorkerDebuggerManager.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIWritablePropertyBag.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIWritablePropertyBag2.idl
-rw-r--r-- root/root usr/share/idl/firefox/nsIWyciwygChannel.idl
diff --git a/firefox/.md5sum b/firefox/.md5sum
index e01bb24..ee020b1 100644
--- a/firefox/.md5sum
+++ b/firefox/.md5sum
@@ -1,3 +1,4 @@
-d8ec0cad257e02d379828785e8790e17 firefox-35.0.source.tar.bz2
+3ad498a021dcad5ca99b7b3c825d1d7b bz680547.patch
+27ac7fc78ab168f2c37e2a57d429d7e0 firefox-36.0.source.tar.bz2
1c53b819f800c61cd50e7c47bdb30bf0 firefox-install-dir.patch
cf6971669f70b440cb6ff8df8b2722ae firefox.desktop
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 3302642..f3136ed 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -4,16 +4,17 @@
# Depends on: nss, libidl, gtk, python, alsa-lib, yasm, mesa3d
name=firefox
-version=35.0
+version=36.0
release=1
source=(ftp://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-…
- firefox-install-dir.patch firefox.desktop)
+ firefox-install-dir.patch firefox.desktop bz680547.patch)
build() {
cd mozilla-release
-patch -p 1 -i $SRC/firefox-install-dir.patch
-
+ patch -p1 -i $SRC/firefox-install-dir.patch
+ patch -p1 -i $SRC/bz680547.patch
+
cat <<- EOF > .mozconfig
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
@@ -29,7 +30,7 @@ cat <<- EOF > .mozconfig
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
- ac_add_options --enable-optimize="$CFLAGS -mno-avx"
+ ac_add_options --enable-optimize="$CFLAGS"
ac_add_options --enable-official-branding
ac_add_options --enable-extensions=default,-gnomevfs
ac_add_options --enable-shared
diff --git a/firefox/bz680547.patch b/firefox/bz680547.patch
new file mode 100644
index 0000000..694d119
--- /dev/null
+++ b/firefox/bz680547.patch
@@ -0,0 +1,76 @@
+# HG changeset patch
+# User L. David Baron <dbaron(a)dbaron.org>
+# Date 1423526165 -39600
+# Tue Feb 10 10:56:05 2015 +1100
+# Node ID bb794f1592545807ddbb56b4dc0392bf180ffade
+# Parent cba00af659930c70eb5940e230950e3ead0f9e12
+Bug 680547 - Compile Linux 64-bit NS_InvokeByIndex with -mno-avx to allow compiling with -march=native on new hardware, or similar -march flags.
+
+As explained in bug 1111355, having avx enabled appears to change the
+alignment behavior of alloca (apparently adding an extra 16 bytes) of
+padding/alignment (and using 32-byte alignment instead of 16-byte). The
+suggestion of using __bultin_alloca_with_align in bug 1111355 didn't fix
+the problem, so this seems to be the best available workaround, given
+that this code, which should perhaps better be written in assembly, is
+written in C++.
+
+Interestingly, this is NOT fixed by #pragma GCC target ("arch=x86-64").
+(I determined the (undocumented) name for the default -march value on
+x86_64 from the gcc source code (gcc/config/i386/i386.c, function
+ix86_option_override_internal, code that sets opts->x_ix86_arch_string .)
+I confirmed that this sets the same macros based on the empty diff
+between the output of 'gcc -E -dM -x c++ /dev/null' and 'gcc -E -dM -x
+c++ -march=x86-64 /dev/null', which was not an empty diff for other
+-march values (e.g., k8).)
+
+I confirmed that the push_options and pop_options actually work by
+putting the push/pop pair around a different (earlier) function, and
+testing that this did not fix the bug (with the pop_options before
+NS_InvokeByIndex).
+
+See the gcc documentation at:
+https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Function-Specific-Option-Pragmas.html
+https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Function-Attributes.html
+https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/i386-and-x86-64-Options.html
+
+diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp
+--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp
++++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp
+@@ -96,16 +96,26 @@ invoke_copy_to_stack(uint64_t * d, uint3
+ if (nr_gpr < GPR_COUNT)
+ gpregs[nr_gpr++] = value;
+ else
+ *d++ = value;
+ }
+ }
+ }
+
++// Disable avx for the next function to allow compilation with
++// -march=native on new machines, or similar hardcoded -march options.
++// Having avx enabled appears to change the alignment behavior of alloca
++// (apparently adding an extra 16 bytes) of padding/alignment (and using
++// 32-byte alignment instead of 16-byte). This seems to be the best
++// available workaround, given that this code, which should perhaps
++// better be written in assembly, is written in C++.
++#pragma GCC push_options
++#pragma GCC target ("no-avx")
++
+ EXPORT_XPCOM_API(nsresult)
+ NS_InvokeByIndex(nsISupports * that, uint32_t methodIndex,
+ uint32_t paramCount, nsXPTCVariant * params)
+ {
+ uint32_t nr_stack;
+ invoke_count_words(paramCount, params, nr_stack);
+
+ // Stack, if used, must be 16-bytes aligned
+@@ -159,8 +169,10 @@ NS_InvokeByIndex(nsISupports * that, uin
+ typedef nsresult (*Method)(uint64_t, uint64_t, uint64_t, uint64_t,
+ uint64_t, uint64_t, double, double, double,
+ double, double, double, double, double);
+ nsresult result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5,
+ d0, d1, d2, d3, d4, d5,
+ d6, d7);
+ return result;
+ }
++
++#pragma GCC pop_options
1
0
ports/core (3.1): [notify] glibc: added patches for CVE-2012-3406, CVE-2014-7817, CVE-2014-9402 and CVE-2015-1472
by crux@crux.nu 21 Feb '15
by crux@crux.nu 21 Feb '15
21 Feb '15
commit 82ff7b38d97f65850e247f0239f4732f01edb7b6
Author: Fredrik Rinnestam <fredrik(a)crux.nu>
Date: Sat Feb 21 17:11:07 2015 +0100
[notify] glibc: added patches for CVE-2012-3406, CVE-2014-7817, CVE-2014-9402 and CVE-2015-1472
diff --git a/glibc/.md5sum b/glibc/.md5sum
index fedcfaa..471c4d1 100644
--- a/glibc/.md5sum
+++ b/glibc/.md5sum
@@ -1,4 +1,8 @@
+c241d3240d0d98af4f1b948cd940dbd8 CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch
1d06c7a6084db7710bec7215143c5799 CVE-2014-0475.patch
+59f56ab2c3b3334074c07dec6c217301 CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch
+27ae57547600f9c6a9a897aa6f4e5555 CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch
+b2a77e95e8694f37415f86e8bc0a1fe5 CVE-2015-1472-wscanf-allocates-too-little-memory.patch
a568134a222776d8fc23059dfb25d835 glibc-2.19-multilib-dirs.patch
e26b8cc666b162f999404b03970f14e4 glibc-2.19.tar.xz
96156bec8e05de67384dc93e72bdc313 host.conf
diff --git a/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch b/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch
new file mode 100644
index 0000000..6b40c96
--- /dev/null
+++ b/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch
@@ -0,0 +1,274 @@
+From 6143805bb45e716829d86851e9372f55a136064b Mon Sep 17 00:00:00 2001
+From: Jeff Law <law(a)redhat.com>
+Date: Mon, 15 Dec 2014 10:09:32 +0100
+Subject: [PATCH 35/37] CVE-2012-3406: Stack overflow in vfprintf [BZ #16617]
+
+A larger number of format specifiers coudld cause a stack overflow,
+potentially allowing to bypass _FORTIFY_SOURCE format string
+protection.
+
+Conflicts:
+ ChangeLog
+ NEWS
+---
+ ChangeLog | 13 +++++++++
+ NEWS | 57 ++++++++++++++++++++++++++++++++++++++++
+ stdio-common/Makefile | 2 +-
+ stdio-common/bug23-2.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
+ stdio-common/bug23-3.c | 50 +++++++++++++++++++++++++++++++++++
+ stdio-common/bug23-4.c | 31 ++++++++++++++++++++++
+ stdio-common/vfprintf.c | 40 ++++++++++++++++++++++++++--
+ 7 files changed, 260 insertions(+), 3 deletions(-)
+ create mode 100644 stdio-common/bug23-2.c
+ create mode 100644 stdio-common/bug23-3.c
+ create mode 100644 stdio-common/bug23-4.c
+
+diff --git a/stdio-common/bug23-2.c b/stdio-common/bug23-2.c
+new file mode 100644
+index 0000000..9e0cfe6
+--- /dev/null
++++ b/stdio-common/bug23-2.c
+@@ -0,0 +1,70 @@
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++
++static const char expected[] = "\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
++
++static int
++do_test (void)
++{
++ char *buf = malloc (strlen (expected) + 1);
++ snprintf (buf, strlen (expected) + 1,
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
++ "a", "b", "c", "d", 5);
++ return strcmp (buf, expected) != 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/stdio-common/bug23-3.c b/stdio-common/bug23-3.c
+new file mode 100644
+index 0000000..57c8cef
+--- /dev/null
++++ b/stdio-common/bug23-3.c
+@@ -0,0 +1,50 @@
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++
++int
++do_test (void)
++{
++ size_t instances = 16384;
++#define X0 "\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
++ const char *item = "\na\nabbcd55";
++#define X3 X0 X0 X0 X0 X0 X0 X0 X0
++#define X6 X3 X3 X3 X3 X3 X3 X3 X3
++#define X9 X6 X6 X6 X6 X6 X6 X6 X6
++#define X12 X9 X9 X9 X9 X9 X9 X9 X9
++#define X14 X12 X12 X12 X12
++#define TRAILER "%%%%%%%%%%%%%%%%%%%%%%%%%%"
++#define TRAILER2 TRAILER TRAILER
++ size_t length = instances * strlen (item) + strlen (TRAILER) + 1;
++
++ char *buf = malloc (length + 1);
++ snprintf (buf, length + 1,
++ X14 TRAILER2 "\n",
++ "a", "b", "c", "d", 5);
++
++ const char *p = buf;
++ size_t i;
++ for (i = 0; i < instances; ++i)
++ {
++ const char *expected;
++ for (expected = item; *expected; ++expected)
++ {
++ if (*p != *expected)
++ {
++ printf ("mismatch at offset %zu (%zu): expected %d, got %d\n",
++ (size_t) (p - buf), i, *expected & 0xFF, *p & 0xFF);
++ return 1;
++ }
++ ++p;
++ }
++ }
++ if (strcmp (p, TRAILER "\n") != 0)
++ {
++ printf ("mismatch at trailer: [%s]\n", p);
++ return 1;
++ }
++ free (buf);
++ return 0;
++}
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/stdio-common/bug23-4.c b/stdio-common/bug23-4.c
+new file mode 100644
+index 0000000..a478564
+--- /dev/null
++++ b/stdio-common/bug23-4.c
+@@ -0,0 +1,31 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/resource.h>
++
++#define LIMIT 1000000
++
++int
++main (void)
++{
++ struct rlimit lim;
++ getrlimit (RLIMIT_STACK, &lim);
++ lim.rlim_cur = 1048576;
++ setrlimit (RLIMIT_STACK, &lim);
++ char *fmtstr = malloc (4 * LIMIT + 1);
++ if (fmtstr == NULL)
++ abort ();
++ char *output = malloc (LIMIT + 1);
++ if (output == NULL)
++ abort ();
++ for (size_t i = 0; i < LIMIT; i++)
++ memcpy (fmtstr + 4 * i, "%1$d", 4);
++ fmtstr[4 * LIMIT] = '\0';
++ int ret = snprintf (output, LIMIT + 1, fmtstr, 0);
++ if (ret != LIMIT)
++ abort ();
++ for (size_t i = 0; i < LIMIT; i++)
++ if (output[i] != '0')
++ abort ();
++ return 0;
++}
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+index f7e5f61..f423be6 100644
+--- a/stdio-common/vfprintf.c
++++ b/stdio-common/vfprintf.c
+@@ -263,6 +263,12 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+ /* For the argument descriptions, which may be allocated on the heap. */
+ void *args_malloced = NULL;
+
++ /* For positional argument handling. */
++ struct printf_spec *specs;
++
++ /* Track if we malloced the SPECS array and thus must free it. */
++ bool specs_malloced = false;
++
+ /* This table maps a character into a number representing a
+ class. In each step there is a destination label for each
+ class. */
+@@ -1678,8 +1684,8 @@ do_positional:
+ size_t nspecs = 0;
+ /* A more or less arbitrary start value. */
+ size_t nspecs_size = 32 * sizeof (struct printf_spec);
+- struct printf_spec *specs = alloca (nspecs_size);
+
++ specs = alloca (nspecs_size);
+ /* The number of arguments the format string requests. This will
+ determine the size of the array needed to store the argument
+ attributes. */
+@@ -1720,11 +1726,39 @@ do_positional:
+ if (nspecs * sizeof (*specs) >= nspecs_size)
+ {
+ /* Extend the array of format specifiers. */
++ if (nspecs_size * 2 < nspecs_size)
++ {
++ __set_errno (ENOMEM);
++ done = -1;
++ goto all_done;
++ }
+ struct printf_spec *old = specs;
+- specs = extend_alloca (specs, nspecs_size, 2 * nspecs_size);
++ if (__libc_use_alloca (2 * nspecs_size))
++ specs = extend_alloca (specs, nspecs_size, 2 * nspecs_size);
++ else
++ {
++ nspecs_size *= 2;
++ specs = malloc (nspecs_size);
++ if (specs == NULL)
++ {
++ __set_errno (ENOMEM);
++ specs = old;
++ done = -1;
++ goto all_done;
++ }
++ }
+
+ /* Copy the old array's elements to the new space. */
+ memmove (specs, old, nspecs * sizeof (*specs));
++
++ /* If we had previously malloc'd space for SPECS, then
++ release it after the copy is complete. */
++ if (specs_malloced)
++ free (old);
++
++ /* Now set SPECS_MALLOCED if needed. */
++ if (!__libc_use_alloca (nspecs_size))
++ specs_malloced = true;
+ }
+
+ /* Parse the format specifier. */
+@@ -2045,6 +2079,8 @@ do_positional:
+ }
+
+ all_done:
++ if (specs_malloced)
++ free (specs);
+ if (__glibc_unlikely (args_malloced != NULL))
+ free (args_malloced);
+ if (__glibc_unlikely (workstart != NULL))
+--
+2.2.1
+
diff --git a/glibc/CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch b/glibc/CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch
new file mode 100644
index 0000000..8e4a32f
--- /dev/null
+++ b/glibc/CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch
@@ -0,0 +1,174 @@
+From b9b6e3f01655942891bf4c66a2c5e8246cdad7e1 Mon Sep 17 00:00:00 2001
+From: Carlos O'Donell <carlos(a)redhat.com>
+Date: Wed, 19 Nov 2014 11:44:12 -0500
+Subject: [PATCH 1/2] CVE-2014-7817: wordexp fails to honour WRDE_NOCMD.
+
+The function wordexp() fails to properly handle the WRDE_NOCMD
+flag when processing arithmetic inputs in the form of "$((... ``))"
+where "..." can be anything valid. The backticks in the arithmetic
+epxression are evaluated by in a shell even if WRDE_NOCMD forbade
+command substitution. This allows an attacker to attempt to pass
+dangerous commands via constructs of the above form, and bypass
+the WRDE_NOCMD flag. This patch fixes this by checking for WRDE_NOCMD
+in exec_comm(), the only place that can execute a shell. All other
+checks for WRDE_NOCMD are superfluous and removed.
+
+We expand the testsuite and add 3 new regression tests of roughly
+the same form but with a couple of nested levels.
+
+On top of the 3 new tests we add fork validation to the WRDE_NOCMD
+testing. If any forks are detected during the execution of a wordexp()
+call with WRDE_NOCMD, the test is marked as failed. This is slightly
+heuristic since vfork might be used in the future, but it provides a
+higher level of assurance that no shells were executed as part of
+command substitution with WRDE_NOCMD in effect. In addition it doesn't
+require libpthread or libdl, instead we use the public implementation
+namespace function __register_atfork (already part of the public ABI
+for libpthread).
+
+Tested on x86_64 with no regressions.
+
+Conflicts:
+ ChangeLog
+ NEWS
+---
+ ChangeLog | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 10 ++
+ posix/wordexp-test.c | 44 +++++++++
+ posix/wordexp.c | 16 +---
+ 4 files changed, 324 insertions(+), 12 deletions(-)
+
+diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
+index 4957006..bdd65e4 100644
+--- a/posix/wordexp-test.c
++++ b/posix/wordexp-test.c
+@@ -27,6 +27,25 @@
+
+ #define IFS " \n\t"
+
++extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden")));
++extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
++
++static int __app_register_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void))
++{
++ return __register_atfork (prepare, parent, child,
++ &__dso_handle == NULL ? NULL : __dso_handle);
++}
++
++/* Number of forks seen. */
++static int registered_forks;
++
++/* For each fork increment the fork count. */
++static void
++register_fork (void)
++{
++ registered_forks++;
++}
++
+ struct test_case_struct
+ {
+ int retval;
+@@ -206,6 +225,12 @@ struct test_case_struct
+ { WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS },
+ { WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS },
+ { WRDE_SYNTAX, NULL, "$((010+4+))", 0, 0, { NULL }, IFS },
++ /* Test for CVE-2014-7817. We test 3 combinations of command
++ substitution inside an arithmetic expression to make sure that
++ no commands are executed and error is returned. */
++ { WRDE_CMDSUB, NULL, "$((`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
++ { WRDE_CMDSUB, NULL, "$((1+`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
++ { WRDE_CMDSUB, NULL, "$((1+$((`echo 1`))))", WRDE_NOCMD, 0, { NULL, }, IFS },
+
+ { -1, NULL, NULL, 0, 0, { NULL, }, IFS },
+ };
+@@ -258,6 +283,15 @@ main (int argc, char *argv[])
+ return -1;
+ }
+
++ /* If we are not allowed to do command substitution, we install
++ fork handlers to verify that no forks happened. No forks should
++ happen at all if command substitution is disabled. */
++ if (__app_register_atfork (register_fork, NULL, NULL) != 0)
++ {
++ printf ("Failed to register fork handler.\n");
++ return -1;
++ }
++
+ for (test = 0; test_case[test].retval != -1; test++)
+ if (testit (&test_case[test]))
+ ++fail;
+@@ -367,6 +401,9 @@ testit (struct test_case_struct *tc)
+
+ printf ("Test %d (%s): ", ++tests, tc->words);
+
++ if (tc->flags & WRDE_NOCMD)
++ registered_forks = 0;
++
+ if (tc->flags & WRDE_APPEND)
+ {
+ /* initial wordexp() call, to be appended to */
+@@ -378,6 +415,13 @@ testit (struct test_case_struct *tc)
+ }
+ retval = wordexp (tc->words, &we, tc->flags);
+
++ if ((tc->flags & WRDE_NOCMD)
++ && (registered_forks > 0))
++ {
++ printf ("FAILED fork called for WRDE_NOCMD\n");
++ return 1;
++ }
++
+ if (tc->flags & WRDE_DOOFFS)
+ start_offs = sav_we.we_offs;
+
+diff --git a/posix/wordexp.c b/posix/wordexp.c
+index 366ec18..36a1367 100644
+--- a/posix/wordexp.c
++++ b/posix/wordexp.c
+@@ -893,6 +893,10 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
+ pid_t pid;
+ int noexec = 0;
+
++ /* Do nothing if command substitution should not succeed. */
++ if (flags & WRDE_NOCMD)
++ return WRDE_CMDSUB;
++
+ /* Don't fork() unless necessary */
+ if (!comm || !*comm)
+ return 0;
+@@ -2082,9 +2086,6 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,
+ }
+ }
+
+- if (flags & WRDE_NOCMD)
+- return WRDE_CMDSUB;
+-
+ (*offset) += 2;
+ return parse_comm (word, word_length, max_length, words, offset, flags,
+ quoted? NULL : pwordexp, ifs, ifs_white);
+@@ -2196,9 +2197,6 @@ parse_dquote (char **word, size_t *word_length, size_t *max_length,
+ break;
+
+ case '`':
+- if (flags & WRDE_NOCMD)
+- return WRDE_CMDSUB;
+-
+ ++(*offset);
+ error = parse_backtick (word, word_length, max_length, words,
+ offset, flags, NULL, NULL, NULL);
+@@ -2357,12 +2355,6 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
+ break;
+
+ case '`':
+- if (flags & WRDE_NOCMD)
+- {
+- error = WRDE_CMDSUB;
+- goto do_error;
+- }
+-
+ ++words_offset;
+ error = parse_backtick (&word, &word_length, &max_length, words,
+ &words_offset, flags, pwordexp, ifs,
+--
+2.2.1
+
diff --git a/glibc/CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch b/glibc/CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch
new file mode 100644
index 0000000..d9c01fa
--- /dev/null
+++ b/glibc/CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch
@@ -0,0 +1,32 @@
+From c9e9c2e4b1bdd880e11ad1d0756da87634456b95 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer(a)redhat.com>
+Date: Mon, 15 Dec 2014 17:41:13 +0100
+Subject: [PATCH] Avoid infinite loop in nss_dns getnetbyname [BZ #17630]
+
+Conflicts:
+ ChangeLog
+ NEWS
+---
+ ChangeLog | 14 ++++++++++++++
+ NEWS | 8 ++++++++
+ resolv/nss_dns/dns-network.c | 4 ++--
+ 3 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
+index 13ad38c..1993ec1 100644
+--- a/resolv/nss_dns/dns-network.c
++++ b/resolv/nss_dns/dns-network.c
+@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
+
+ case BYNAME:
+ {
+- char **ap = result->n_aliases++;
+- while (*ap != NULL)
++ char **ap;
++ for (ap = result->n_aliases; *ap != NULL; ++ap)
+ {
+ /* Check each alias name for being of the forms:
+ 4.3.2.1.in-addr.arpa = net 1.2.3.4
+--
+2.2.1
+
diff --git a/glibc/CVE-2015-1472-wscanf-allocates-too-little-memory.patch b/glibc/CVE-2015-1472-wscanf-allocates-too-little-memory.patch
new file mode 100644
index 0000000..e472684
--- /dev/null
+++ b/glibc/CVE-2015-1472-wscanf-allocates-too-little-memory.patch
@@ -0,0 +1,105 @@
+From 18d9cd1d9d95503074db705686d0236c99db5d00 Mon Sep 17 00:00:00 2001
+From: Paul Pluzhnikov <ppluzhnikov(a)google.com>
+Date: Fri, 6 Feb 2015 00:30:42 -0500
+Subject: [PATCH 2/2] CVE-2015-1472: wscanf allocates too little memory
+
+BZ #16618
+
+Under certain conditions wscanf can allocate too little memory for the
+to-be-scanned arguments and overflow the allocated buffer. The
+implementation now correctly computes the required buffer size when
+using malloc.
+
+A regression test was added to tst-sscanf.
+
+Conflicts:
+ ChangeLog
+ NEWS
+---
+ ChangeLog | 133 ++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 44 +++++++++++++++
+ stdio-common/tst-sscanf.c | 33 ++++++++++++
+ stdio-common/vfscanf.c | 12 ++---
+ 4 files changed, 216 insertions(+), 6 deletions(-)
+
+diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
+index 1214c7d..c62bee6 100644
+--- a/stdio-common/tst-sscanf.c
++++ b/stdio-common/tst-sscanf.c
+@@ -232,5 +232,38 @@ main (void)
+ }
+ }
+
++ /* BZ #16618
++ The test will segfault during SSCANF if the buffer overflow
++ is not fixed. The size of `s` is such that it forces the use
++ of malloc internally and this triggers the incorrect computation.
++ Thus the value for SIZE is arbitrariy high enough that malloc
++ is used. */
++ {
++#define SIZE 131072
++ CHAR *s = malloc ((SIZE + 1) * sizeof (*s));
++ if (s == NULL)
++ abort ();
++ for (size_t i = 0; i < SIZE; i++)
++ s[i] = L('0');
++ s[SIZE] = L('\0');
++ int i = 42;
++ /* Scan multi-digit zero into `i`. */
++ if (SSCANF (s, L("%d"), &i) != 1)
++ {
++ printf ("FAIL: bug16618: SSCANF did not read one input item.\n");
++ result = 1;
++ }
++ if (i != 0)
++ {
++ printf ("FAIL: bug16618: Value of `i` was not zero as expected.\n");
++ result = 1;
++ }
++ free (s);
++ if (result != 1)
++ printf ("PASS: bug16618: Did not crash.\n");
++#undef SIZE
++ }
++
++
+ return result;
+ }
+diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
+index 2e1e91a..d7a18e3 100644
+--- a/stdio-common/vfscanf.c
++++ b/stdio-common/vfscanf.c
+@@ -272,9 +272,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
+ if (__builtin_expect (wpsize == wpmax, 0)) \
+ { \
+ CHAR_T *old = wp; \
+- size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \
+- ? UCHAR_MAX + 1 : 2 * wpmax); \
+- if (use_malloc || !__libc_use_alloca (newsize)) \
++ bool fits = __glibc_likely (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 2); \
++ size_t wpneed = MAX (UCHAR_MAX + 1, 2 * wpmax); \
++ size_t newsize = fits ? wpneed * sizeof (CHAR_T) : SIZE_MAX; \
++ if (!__libc_use_alloca (newsize)) \
+ { \
+ wp = realloc (use_malloc ? wp : NULL, newsize); \
+ if (wp == NULL) \
+@@ -286,14 +287,13 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
+ } \
+ if (! use_malloc) \
+ MEMCPY (wp, old, wpsize); \
+- wpmax = newsize; \
++ wpmax = wpneed; \
+ use_malloc = true; \
+ } \
+ else \
+ { \
+ size_t s = wpmax * sizeof (CHAR_T); \
+- wp = (CHAR_T *) extend_alloca (wp, s, \
+- newsize * sizeof (CHAR_T)); \
++ wp = (CHAR_T *) extend_alloca (wp, s, newsize); \
+ wpmax = s / sizeof (CHAR_T); \
+ if (old != NULL) \
+ MEMCPY (wp, old, wpsize); \
+--
+2.2.1
+
diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index e4910ed..5bd7570 100644
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -4,11 +4,15 @@
name=glibc
version=2.19
-release=4
+release=5
source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
http://crux.nu/files/distfiles/kernel-headers-3.12.tar.bz2 \
$name-$version-multilib-dirs.patch \
CVE-2014-0475.patch iconv-gconv_trans.c.patch \
+ CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch \
+ CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch \
+ CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch \
+ CVE-2015-1472-wscanf-allocates-too-little-memory.patch \
hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
build() {
@@ -20,6 +24,10 @@ build() {
patch -p1 -d $SRC/$name-$version -i $SRC/$name-$version-multilib-dirs.patch
patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2014-0475.patch
patch -p1 -d $SRC/$name-$version -i $SRC/iconv-gconv_trans.c.patch
+ patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch
+ patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch
+ patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2014-9402-Avoid-infinite-loop-in-nss_dns-getnetbyname.patch
+ patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-1472-wscanf-allocates-too-little-memory.patch
mkdir $SRC/build
cd $SRC/build
1
0
commit d13285ce888f9fb6e2e27c981027e121f02558dd
Author: Danny Rawlins <monster.romster(a)gmail.com>
Date: Sun Feb 22 00:49:24 2015 +1100
[notify] netpbm: dropped
diff --git a/netpbm/.footprint b/netpbm/.footprint
deleted file mode 100644
index 9de6b31..0000000
--- a/netpbm/.footprint
+++ /dev/null
@@ -1,389 +0,0 @@
-drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/bin/
--rwxr-xr-x root/root usr/bin/411toppm
--rwxr-xr-x root/root usr/bin/anytopnm
--rwxr-xr-x root/root usr/bin/asciitopgm
--rwxr-xr-x root/root usr/bin/atktopbm
--rwxr-xr-x root/root usr/bin/avstopam
--rwxr-xr-x root/root usr/bin/bioradtopgm
--rwxr-xr-x root/root usr/bin/bmptopnm
-lrwxrwxrwx root/root usr/bin/bmptoppm -> bmptopnm
--rwxr-xr-x root/root usr/bin/brushtopbm
--rwxr-xr-x root/root usr/bin/cameratopam
--rwxr-xr-x root/root usr/bin/cistopbm
--rwxr-xr-x root/root usr/bin/cmuwmtopbm
--rwxr-xr-x root/root usr/bin/ddbugtopbm
--rwxr-xr-x root/root usr/bin/escp2topbm
--rwxr-xr-x root/root usr/bin/eyuvtoppm
--rwxr-xr-x root/root usr/bin/fiascotopnm
--rwxr-xr-x root/root usr/bin/fitstopnm
--rwxr-xr-x root/root usr/bin/fstopgm
--rwxr-xr-x root/root usr/bin/g3topbm
-lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm
--rwxr-xr-x root/root usr/bin/gemtopnm
--rwxr-xr-x root/root usr/bin/giftopnm
--rwxr-xr-x root/root usr/bin/gouldtoppm
--rwxr-xr-x root/root usr/bin/hdifftopam
--rwxr-xr-x root/root usr/bin/hipstopgm
--rwxr-xr-x root/root usr/bin/hpcdtoppm
-lrwxrwxrwx root/root usr/bin/icontopbm -> sunicontopnm
--rwxr-xr-x root/root usr/bin/ilbmtoppm
--rwxr-xr-x root/root usr/bin/imgtoppm
--rwxr-xr-x root/root usr/bin/infotopam
--rwxr-xr-x root/root usr/bin/jbigtopnm
--rwxr-xr-x root/root usr/bin/jpeg2ktopam
--rwxr-xr-x root/root usr/bin/jpegtopnm
--rwxr-xr-x root/root usr/bin/leaftoppm
--rwxr-xr-x root/root usr/bin/lispmtopgm
--rwxr-xr-x root/root usr/bin/macptopbm
--rwxr-xr-x root/root usr/bin/manweb
--rwxr-xr-x root/root usr/bin/mdatopbm
--rwxr-xr-x root/root usr/bin/mgrtopbm
--rwxr-xr-x root/root usr/bin/mrftopbm
--rwxr-xr-x root/root usr/bin/mtvtoppm
--rwxr-xr-x root/root usr/bin/neotoppm
--rwxr-xr-x root/root usr/bin/palmtopnm
--rwxr-xr-x root/root usr/bin/pamaddnoise
--rwxr-xr-x root/root usr/bin/pamarith
--rwxr-xr-x root/root usr/bin/pambackground
--rwxr-xr-x root/root usr/bin/pambayer
--rwxr-xr-x root/root usr/bin/pamchannel
--rwxr-xr-x root/root usr/bin/pamcomp
--rwxr-xr-x root/root usr/bin/pamcut
--rwxr-xr-x root/root usr/bin/pamdeinterlace
--rwxr-xr-x root/root usr/bin/pamdepth
--rwxr-xr-x root/root usr/bin/pamdice
--rwxr-xr-x root/root usr/bin/pamditherbw
--rwxr-xr-x root/root usr/bin/pamedge
--rwxr-xr-x root/root usr/bin/pamendian
--rwxr-xr-x root/root usr/bin/pamenlarge
--rwxr-xr-x root/root usr/bin/pamexec
--rwxr-xr-x root/root usr/bin/pamfile
--rwxr-xr-x root/root usr/bin/pamfixtrunc
--rwxr-xr-x root/root usr/bin/pamflip
--rwxr-xr-x root/root usr/bin/pamfunc
--rwxr-xr-x root/root usr/bin/pamgauss
--rwxr-xr-x root/root usr/bin/pamgradient
--rwxr-xr-x root/root usr/bin/pamlookup
--rwxr-xr-x root/root usr/bin/pammasksharpen
--rwxr-xr-x root/root usr/bin/pammixinterlace
--rwxr-xr-x root/root usr/bin/pammosaicknit
--rwxr-xr-x root/root usr/bin/pamoil
--rwxr-xr-x root/root usr/bin/pampaintspill
--rwxr-xr-x root/root usr/bin/pamperspective
--rwxr-xr-x root/root usr/bin/pampick
--rwxr-xr-x root/root usr/bin/pampop9
--rwxr-xr-x root/root usr/bin/pamrecolor
--rwxr-xr-x root/root usr/bin/pamrgbatopng
--rwxr-xr-x root/root usr/bin/pamrubber
--rwxr-xr-x root/root usr/bin/pamscale
--rwxr-xr-x root/root usr/bin/pamseq
--rwxr-xr-x root/root usr/bin/pamsharpmap
--rwxr-xr-x root/root usr/bin/pamsharpness
--rwxr-xr-x root/root usr/bin/pamsistoaglyph
--rwxr-xr-x root/root usr/bin/pamslice
--rwxr-xr-x root/root usr/bin/pamsplit
--rwxr-xr-x root/root usr/bin/pamstack
--rwxr-xr-x root/root usr/bin/pamstereogram
--rwxr-xr-x root/root usr/bin/pamstretch
--rwxr-xr-x root/root usr/bin/pamstretch-gen
--rwxr-xr-x root/root usr/bin/pamsumm
--rwxr-xr-x root/root usr/bin/pamsummcol
--rwxr-xr-x root/root usr/bin/pamthreshold
--rwxr-xr-x root/root usr/bin/pamtilt
--rwxr-xr-x root/root usr/bin/pamtoavs
--rwxr-xr-x root/root usr/bin/pamtodjvurle
--rwxr-xr-x root/root usr/bin/pamtofits
--rwxr-xr-x root/root usr/bin/pamtogif
--rwxr-xr-x root/root usr/bin/pamtohdiff
--rwxr-xr-x root/root usr/bin/pamtohtmltbl
--rwxr-xr-x root/root usr/bin/pamtojpeg2k
--rwxr-xr-x root/root usr/bin/pamtompfont
--rwxr-xr-x root/root usr/bin/pamtooctaveimg
--rwxr-xr-x root/root usr/bin/pamtopam
--rwxr-xr-x root/root usr/bin/pamtopdbimg
--rwxr-xr-x root/root usr/bin/pamtopfm
--rwxr-xr-x root/root usr/bin/pamtopnm
--rwxr-xr-x root/root usr/bin/pamtosrf
--rwxr-xr-x root/root usr/bin/pamtosvg
--rwxr-xr-x root/root usr/bin/pamtotga
--rwxr-xr-x root/root usr/bin/pamtotiff
--rwxr-xr-x root/root usr/bin/pamtouil
--rwxr-xr-x root/root usr/bin/pamtoxvmini
--rwxr-xr-x root/root usr/bin/pamundice
--rwxr-xr-x root/root usr/bin/pamwipeout
--rwxr-xr-x root/root usr/bin/pbmclean
--rwxr-xr-x root/root usr/bin/pbmlife
--rwxr-xr-x root/root usr/bin/pbmmake
--rwxr-xr-x root/root usr/bin/pbmmask
--rwxr-xr-x root/root usr/bin/pbmminkowski
--rwxr-xr-x root/root usr/bin/pbmpage
--rwxr-xr-x root/root usr/bin/pbmpscale
--rwxr-xr-x root/root usr/bin/pbmreduce
--rwxr-xr-x root/root usr/bin/pbmtext
--rwxr-xr-x root/root usr/bin/pbmtextps
--rwxr-xr-x root/root usr/bin/pbmto10x
--rwxr-xr-x root/root usr/bin/pbmto4425
--rwxr-xr-x root/root usr/bin/pbmtoascii
--rwxr-xr-x root/root usr/bin/pbmtoatk
--rwxr-xr-x root/root usr/bin/pbmtobbnbg
--rwxr-xr-x root/root usr/bin/pbmtocis
--rwxr-xr-x root/root usr/bin/pbmtocmuwm
--rwxr-xr-x root/root usr/bin/pbmtodjvurle
--rwxr-xr-x root/root usr/bin/pbmtoepsi
--rwxr-xr-x root/root usr/bin/pbmtoepson
--rwxr-xr-x root/root usr/bin/pbmtoescp2
--rwxr-xr-x root/root usr/bin/pbmtog3
--rwxr-xr-x root/root usr/bin/pbmtogem
--rwxr-xr-x root/root usr/bin/pbmtogo
--rwxr-xr-x root/root usr/bin/pbmtoibm23xx
-lrwxrwxrwx root/root usr/bin/pbmtoicon -> pbmtosunicon
--rwxr-xr-x root/root usr/bin/pbmtolj
--rwxr-xr-x root/root usr/bin/pbmtoln03
--rwxr-xr-x root/root usr/bin/pbmtolps
--rwxr-xr-x root/root usr/bin/pbmtomacp
--rwxr-xr-x root/root usr/bin/pbmtomatrixorbital
--rwxr-xr-x root/root usr/bin/pbmtomda
--rwxr-xr-x root/root usr/bin/pbmtomgr
--rwxr-xr-x root/root usr/bin/pbmtomrf
--rwxr-xr-x root/root usr/bin/pbmtonokia
--rwxr-xr-x root/root usr/bin/pbmtopgm
--rwxr-xr-x root/root usr/bin/pbmtopi3
--rwxr-xr-x root/root usr/bin/pbmtopk
--rwxr-xr-x root/root usr/bin/pbmtoplot
--rwxr-xr-x root/root usr/bin/pbmtoppa
--rwxr-xr-x root/root usr/bin/pbmtopsg3
--rwxr-xr-x root/root usr/bin/pbmtoptx
--rwxr-xr-x root/root usr/bin/pbmtosunicon
--rwxr-xr-x root/root usr/bin/pbmtowbmp
--rwxr-xr-x root/root usr/bin/pbmtox10bm
--rwxr-xr-x root/root usr/bin/pbmtoxbm
--rwxr-xr-x root/root usr/bin/pbmtoybm
--rwxr-xr-x root/root usr/bin/pbmtozinc
--rwxr-xr-x root/root usr/bin/pbmupc
--rwxr-xr-x root/root usr/bin/pc1toppm
--rwxr-xr-x root/root usr/bin/pcdovtoppm
--rwxr-xr-x root/root usr/bin/pcxtoppm
--rwxr-xr-x root/root usr/bin/pdbimgtopam
--rwxr-xr-x root/root usr/bin/pfmtopam
--rwxr-xr-x root/root usr/bin/pgmabel
--rwxr-xr-x root/root usr/bin/pgmbentley
--rwxr-xr-x root/root usr/bin/pgmcrater
--rwxr-xr-x root/root usr/bin/pgmdeshadow
-lrwxrwxrwx root/root usr/bin/pgmedge -> pamedge
--rwxr-xr-x root/root usr/bin/pgmenhance
--rwxr-xr-x root/root usr/bin/pgmhist
--rwxr-xr-x root/root usr/bin/pgmkernel
--rwxr-xr-x root/root usr/bin/pgmmake
--rwxr-xr-x root/root usr/bin/pgmmedian
--rwxr-xr-x root/root usr/bin/pgmminkowski
--rwxr-xr-x root/root usr/bin/pgmmorphconv
--rwxr-xr-x root/root usr/bin/pgmnoise
-lrwxrwxrwx root/root usr/bin/pgmnorm -> pnmnorm
-lrwxrwxrwx root/root usr/bin/pgmoil -> pamoil
--rwxr-xr-x root/root usr/bin/pgmramp
-lrwxrwxrwx root/root usr/bin/pgmslice -> pamslice
--rwxr-xr-x root/root usr/bin/pgmtexture
--rwxr-xr-x root/root usr/bin/pgmtofs
--rwxr-xr-x root/root usr/bin/pgmtolispm
--rwxr-xr-x root/root usr/bin/pgmtopbm
--rwxr-xr-x root/root usr/bin/pgmtopgm
--rwxr-xr-x root/root usr/bin/pgmtoppm
--rwxr-xr-x root/root usr/bin/pi1toppm
--rwxr-xr-x root/root usr/bin/pi3topbm
--rwxr-xr-x root/root usr/bin/picttoppm
--rwxr-xr-x root/root usr/bin/pjtoppm
--rwxr-xr-x root/root usr/bin/pktopbm
--rwxr-xr-x root/root usr/bin/pngtopam
-lrwxrwxrwx root/root usr/bin/pngtopnm -> pngtopam
--rwxr-xr-x root/root usr/bin/pnmalias
-lrwxrwxrwx root/root usr/bin/pnmarith -> pamarith
--rwxr-xr-x root/root usr/bin/pnmcat
--rwxr-xr-x root/root usr/bin/pnmcolormap
--rwxr-xr-x root/root usr/bin/pnmcomp
--rwxr-xr-x root/root usr/bin/pnmconvol
--rwxr-xr-x root/root usr/bin/pnmcrop
-lrwxrwxrwx root/root usr/bin/pnmcut -> pamcut
-lrwxrwxrwx root/root usr/bin/pnmdepth -> pamdepth
-lrwxrwxrwx root/root usr/bin/pnmenlarge -> pamenlarge
-lrwxrwxrwx root/root usr/bin/pnmfile -> pamfile
--rwxr-xr-x root/root usr/bin/pnmflip
--rwxr-xr-x root/root usr/bin/pnmgamma
--rwxr-xr-x root/root usr/bin/pnmhisteq
--rwxr-xr-x root/root usr/bin/pnmhistmap
--rwxr-xr-x root/root usr/bin/pnmindex
-lrwxrwxrwx root/root usr/bin/pnminterp -> pamstretch
--rwxr-xr-x root/root usr/bin/pnminvert
--rwxr-xr-x root/root usr/bin/pnmmargin
--rwxr-xr-x root/root usr/bin/pnmmercator
--rwxr-xr-x root/root usr/bin/pnmmontage
--rwxr-xr-x root/root usr/bin/pnmnlfilt
-lrwxrwxrwx root/root usr/bin/pnmnoraw -> pnmtoplainpnm
--rwxr-xr-x root/root usr/bin/pnmnorm
--rwxr-xr-x root/root usr/bin/pnmpad
--rwxr-xr-x root/root usr/bin/pnmpaste
--rwxr-xr-x root/root usr/bin/pnmpsnr
--rwxr-xr-x root/root usr/bin/pnmquant
--rwxr-xr-x root/root usr/bin/pnmquantall
--rwxr-xr-x root/root usr/bin/pnmremap
--rwxr-xr-x root/root usr/bin/pnmrotate
-lrwxrwxrwx root/root usr/bin/pnmscale -> pamscale
--rwxr-xr-x root/root usr/bin/pnmscalefixed
--rwxr-xr-x root/root usr/bin/pnmshear
--rwxr-xr-x root/root usr/bin/pnmsmooth
-lrwxrwxrwx root/root usr/bin/pnmsplit -> pamsplit
--rwxr-xr-x root/root usr/bin/pnmstitch
--rwxr-xr-x root/root usr/bin/pnmtile
--rwxr-xr-x root/root usr/bin/pnmtoddif
--rwxr-xr-x root/root usr/bin/pnmtofiasco
-lrwxrwxrwx root/root usr/bin/pnmtofits -> pamtofits
--rwxr-xr-x root/root usr/bin/pnmtojbig
--rwxr-xr-x root/root usr/bin/pnmtojpeg
--rwxr-xr-x root/root usr/bin/pnmtopalm
--rwxr-xr-x root/root usr/bin/pnmtopclxl
--rwxr-xr-x root/root usr/bin/pnmtoplainpnm
--rwxr-xr-x root/root usr/bin/pnmtopng
-lrwxrwxrwx root/root usr/bin/pnmtopnm -> pamtopnm
--rwxr-xr-x root/root usr/bin/pnmtops
--rwxr-xr-x root/root usr/bin/pnmtorast
--rwxr-xr-x root/root usr/bin/pnmtorle
--rwxr-xr-x root/root usr/bin/pnmtosgi
--rwxr-xr-x root/root usr/bin/pnmtosir
-lrwxrwxrwx root/root usr/bin/pnmtotiff -> pamtotiff
--rwxr-xr-x root/root usr/bin/pnmtotiffcmyk
--rwxr-xr-x root/root usr/bin/pnmtoxwd
--rwxr-xr-x root/root usr/bin/ppm3d
--rwxr-xr-x root/root usr/bin/ppmbrighten
--rwxr-xr-x root/root usr/bin/ppmchange
--rwxr-xr-x root/root usr/bin/ppmcie
--rwxr-xr-x root/root usr/bin/ppmcolormask
--rwxr-xr-x root/root usr/bin/ppmcolors
--rwxr-xr-x root/root usr/bin/ppmdcfont
--rwxr-xr-x root/root usr/bin/ppmddumpfont
--rwxr-xr-x root/root usr/bin/ppmdim
--rwxr-xr-x root/root usr/bin/ppmdist
--rwxr-xr-x root/root usr/bin/ppmdither
--rwxr-xr-x root/root usr/bin/ppmdmkfont
--rwxr-xr-x root/root usr/bin/ppmdraw
--rwxr-xr-x root/root usr/bin/ppmfade
--rwxr-xr-x root/root usr/bin/ppmflash
--rwxr-xr-x root/root usr/bin/ppmforge
--rwxr-xr-x root/root usr/bin/ppmglobe
--rwxr-xr-x root/root usr/bin/ppmhist
--rwxr-xr-x root/root usr/bin/ppmlabel
--rwxr-xr-x root/root usr/bin/ppmmake
--rwxr-xr-x root/root usr/bin/ppmmix
-lrwxrwxrwx root/root usr/bin/ppmnorm -> pnmnorm
--rwxr-xr-x root/root usr/bin/ppmntsc
--rwxr-xr-x root/root usr/bin/ppmpat
--rwxr-xr-x root/root usr/bin/ppmquant
-lrwxrwxrwx root/root usr/bin/ppmquantall -> pnmquantall
--rwxr-xr-x root/root usr/bin/ppmrainbow
--rwxr-xr-x root/root usr/bin/ppmrelief
--rwxr-xr-x root/root usr/bin/ppmrough
--rwxr-xr-x root/root usr/bin/ppmshadow
--rwxr-xr-x root/root usr/bin/ppmshift
--rwxr-xr-x root/root usr/bin/ppmspread
--rwxr-xr-x root/root usr/bin/ppmtoacad
--rwxr-xr-x root/root usr/bin/ppmtoapplevol
--rwxr-xr-x root/root usr/bin/ppmtoarbtxt
--rwxr-xr-x root/root usr/bin/ppmtoascii
--rwxr-xr-x root/root usr/bin/ppmtobmp
--rwxr-xr-x root/root usr/bin/ppmtoeyuv
--rwxr-xr-x root/root usr/bin/ppmtogif
--rwxr-xr-x root/root usr/bin/ppmtoicr
--rwxr-xr-x root/root usr/bin/ppmtoilbm
-lrwxrwxrwx root/root usr/bin/ppmtojpeg -> pnmtojpeg
--rwxr-xr-x root/root usr/bin/ppmtoleaf
--rwxr-xr-x root/root usr/bin/ppmtolj
--rwxr-xr-x root/root usr/bin/ppmtomap
--rwxr-xr-x root/root usr/bin/ppmtomitsu
--rwxr-xr-x root/root usr/bin/ppmtompeg
--rwxr-xr-x root/root usr/bin/ppmtoneo
--rwxr-xr-x root/root usr/bin/ppmtopcx
--rwxr-xr-x root/root usr/bin/ppmtopgm
--rwxr-xr-x root/root usr/bin/ppmtopi1
--rwxr-xr-x root/root usr/bin/ppmtopict
--rwxr-xr-x root/root usr/bin/ppmtopj
--rwxr-xr-x root/root usr/bin/ppmtopjxl
--rwxr-xr-x root/root usr/bin/ppmtoppm
--rwxr-xr-x root/root usr/bin/ppmtopuzz
--rwxr-xr-x root/root usr/bin/ppmtorgb3
--rwxr-xr-x root/root usr/bin/ppmtosixel
--rwxr-xr-x root/root usr/bin/ppmtospu
--rwxr-xr-x root/root usr/bin/ppmtoterm
-lrwxrwxrwx root/root usr/bin/ppmtouil -> pamtouil
--rwxr-xr-x root/root usr/bin/ppmtowinicon
--rwxr-xr-x root/root usr/bin/ppmtoxpm
--rwxr-xr-x root/root usr/bin/ppmtoyuv
--rwxr-xr-x root/root usr/bin/ppmtoyuvsplit
--rwxr-xr-x root/root usr/bin/ppmtv
--rwxr-xr-x root/root usr/bin/ppmwheel
--rwxr-xr-x root/root usr/bin/psidtopgm
--rwxr-xr-x root/root usr/bin/pstopnm
--rwxr-xr-x root/root usr/bin/qrttoppm
--rwxr-xr-x root/root usr/bin/rasttopnm
--rwxr-xr-x root/root usr/bin/rawtopgm
--rwxr-xr-x root/root usr/bin/rawtoppm
--rwxr-xr-x root/root usr/bin/rgb3toppm
--rwxr-xr-x root/root usr/bin/rlatopam
--rwxr-xr-x root/root usr/bin/rletopnm
--rwxr-xr-x root/root usr/bin/sbigtopgm
--rwxr-xr-x root/root usr/bin/sgitopnm
--rwxr-xr-x root/root usr/bin/sirtopnm
--rwxr-xr-x root/root usr/bin/sldtoppm
--rwxr-xr-x root/root usr/bin/spctoppm
--rwxr-xr-x root/root usr/bin/spottopgm
--rwxr-xr-x root/root usr/bin/sputoppm
--rwxr-xr-x root/root usr/bin/srftopam
--rwxr-xr-x root/root usr/bin/sunicontopnm
--rwxr-xr-x root/root usr/bin/svgtopam
--rwxr-xr-x root/root usr/bin/tgatoppm
--rwxr-xr-x root/root usr/bin/thinkjettopbm
--rwxr-xr-x root/root usr/bin/tifftopnm
--rwxr-xr-x root/root usr/bin/wbmptopbm
--rwxr-xr-x root/root usr/bin/winicontoppm
--rwxr-xr-x root/root usr/bin/xbmtopbm
--rwxr-xr-x root/root usr/bin/ximtoppm
--rwxr-xr-x root/root usr/bin/xpmtoppm
--rwxr-xr-x root/root usr/bin/xvminitoppm
--rwxr-xr-x root/root usr/bin/xwdtopnm
--rwxr-xr-x root/root usr/bin/ybmtopbm
--rwxr-xr-x root/root usr/bin/yuvsplittoppm
--rwxr-xr-x root/root usr/bin/yuvtoppm
--rwxr-xr-x root/root usr/bin/zeisstopnm
-drwxr-xr-x root/root usr/include/
-drwxr-xr-x root/root usr/include/netpbm/
--rw-r--r-- root/root usr/include/netpbm/bitio.h
--rw-r--r-- root/root usr/include/netpbm/colorname.h
--rw-r--r-- root/root usr/include/netpbm/mallocvar.h
--rw-r--r-- root/root usr/include/netpbm/pam.h
--rw-r--r-- root/root usr/include/netpbm/pamdraw.h
--rw-r--r-- root/root usr/include/netpbm/pammap.h
--rw-r--r-- root/root usr/include/netpbm/pbm.h
--rw-r--r-- root/root usr/include/netpbm/pbmfont.h
--rw-r--r-- root/root usr/include/netpbm/pgm.h
--rw-r--r-- root/root usr/include/netpbm/pm.h
--rw-r--r-- root/root usr/include/netpbm/pm_config.h
--rw-r--r-- root/root usr/include/netpbm/pm_gamma.h
--rw-r--r-- root/root usr/include/netpbm/pm_system.h
--rw-r--r-- root/root usr/include/netpbm/pnm.h
--rw-r--r-- root/root usr/include/netpbm/ppm.h
--rw-r--r-- root/root usr/include/netpbm/ppmcmap.h
--rw-r--r-- root/root usr/include/netpbm/ppmdfont.h
--rw-r--r-- root/root usr/include/netpbm/ppmdraw.h
--rw-r--r-- root/root usr/include/netpbm/ppmfloyd.h
--rw-r--r-- root/root usr/include/netpbm/shhopt.h
-drwxr-xr-x root/root usr/lib/
--rw-r--r-- root/root usr/lib/libnetpbm.a
-lrwxrwxrwx root/root usr/lib/libnetpbm.so -> libnetpbm.so.11
-lrwxrwxrwx root/root usr/lib/libnetpbm.so.11 -> libnetpbm.so.11.61
--rwxr-xr-x root/root usr/lib/libnetpbm.so.11.61
-drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/netpbm/
--rw-r--r-- root/root usr/share/netpbm/palmcolor8.map
--rw-r--r-- root/root usr/share/netpbm/palmgray1.map
--rw-r--r-- root/root usr/share/netpbm/palmgray2.map
--rw-r--r-- root/root usr/share/netpbm/palmgray4.map
--rw-r--r-- root/root usr/share/netpbm/pcxstd.ppm
--rw-r--r-- root/root usr/share/netpbm/rgb.txt
diff --git a/netpbm/.md5sum b/netpbm/.md5sum
deleted file mode 100644
index 2eeb8af..0000000
--- a/netpbm/.md5sum
+++ /dev/null
@@ -1,3 +0,0 @@
-a1ffaf616ec44ed67ea8496d8712bac0 config.mk
-8d30e2705b372491ba9920d547f09f13 netpbm-10.34-build.patch
-b2ff0a2d082b838eac2b7ea0d1155715 netpbm-10.61.00.tar.xz
diff --git a/netpbm/Pkgfile b/netpbm/Pkgfile
deleted file mode 100644
index a7e49cb..0000000
--- a/netpbm/Pkgfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description: A set of utilities for converting to/from the netpbm (and related) formats.
-# URL: http://netpbm.sourceforge.net/
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Antti Nykanen, aon at iki dot fi
-# Depends on: libpng libtiff libxml2 xz
-
-name=netpbm
-version=10.61.00
-release=1
-source=(http://crux.ster.zone/distfiles/$name/$name-$version.tar.xz
- config.mk netpbm-10.34-build.patch)
-
-build() {
- cd $name-$version
-
- unset MAKEFLAGS
- patch -p 1 -i $SRC/netpbm-10.34-build.patch
-
- sed -e "s|#CFLAGS#|$CFLAGS|" $SRC/config.mk > config.mk
- sed -i -e 's/\(.*\$(SYMLINK) \)\(pnmtopnm\)\(\$(EXE) \)\(pamtopnm\)/\1\4\3\2/' \
- converter/other/Makefile
-
- make
- make pkgdir=$PKG/usr package
-
- install -d $PKG/usr/share
- mv $PKG/usr/misc $PKG/usr/share/netpbm
-
- rm -r $PKG/usr/{README,VERSION,link,man,config_template,pkginfo,bin/doc.url}
-}
diff --git a/netpbm/config.mk b/netpbm/config.mk
deleted file mode 100644
index 4f88157..0000000
--- a/netpbm/config.mk
+++ /dev/null
@@ -1,664 +0,0 @@
-####This file was automatically created by 'configure.'
-####Many variables are set twice -- a generic setting, then
-####a system-specific override at the bottom of the file.
-####
-# This is a make file inclusion, to be included in all the Netpbm make
-# files.
-
-# This file is meant to contain variable settings that customize the
-# build for a particular target system configuration.
-
-# The distribution contains the file config.mk.in. You edit
-# config.mk.in in ways relevant to your particular environment
-# to create config.mk. The "configure" program will do this
-# for you in simple cases.
-
-# Some of the variables that the including make file must set for this
-# file to work:
-#
-# SRCDIR: The directory at the top of the Netpbm source tree. Note that
-# this is typically a relative directory, and it must be relative to the
-# make file that includes this file.
-
-DEFAULT_TARGET = nonmerge
-#DEFAULT_TARGET = merge
-
-# Fiasco has some special requirements that make it fail to compile on
-# some systems, and since it isn't very important, just set this to "N"
-# and skip it on those systems unless you want to debug it and fix it.
-# OpenBSD:
-#BUILD_FIASCO = N
-BUILD_FIASCO = Y
-
-# The following are commands for the build process to use. These values
-# do not get built into anything.
-
-# The C compiler (including macro preprocessor)
-CC ?= gcc
-# Note that 'cc' is usually an alias for whatever is the main compiler
-# on a system, e.g. the GNU Compiler on Linux.
-#CC = cc
-
-# The linker.
-LD = $(CC)
-#LD = ld
-#Tru64:
-#LD = cc
-#LD = gcc
-
-#If the linker identified above is a compiler that invokes a linker
-#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is
-#that we expect a compiler to take linker options in the '-Wl,-opt1,val1'
-#syntax whereas the actual linker would take '-opt1 val1'.
-LINKERISCOMPILER=Y
-#If $(LD) is 'ld':
-#LINKERISCOMPILER=N
-
-#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can
-#take a library as just another link object argument, as in 'ld
-#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a
-#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'.
-#This variable controls how 'libopt' gets built. Note that with some
-#linkers, you can specify a shared library explicitly, but then it has
-#to live in that exact place at run time. That's not good enough for us.
-
-LINKER_CAN_DO_EXPLICIT_LIBRARY=N
-#GNU:
-#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
-
-# This is the name of the header file that declares the types
-# uint32_t, etc. This name is used as #include $(INTTYPES_H) .
-# Set to null if the types come automatically without including anything.
-
-# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO
-# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include
-# sys/types for other things), so for that environment, <inttypes.h>
-# won't work, but "inttypes_netpbm.h" might.
-
-INTTYPES_H = <inttypes.h>
-# Linux libc5:
-#INTTYPES_H = <types.h>
-# Solaris:
-# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc.
-#INTTYPES_H = "inttypes_netpbm.h"
-# Others:
-#INTTYPES_H = <sys/stdint.h>
-#INTTYPES_H = <sys/types.h>
-# The automatically generated Netpbm version:
-#INTTYPES_H = "inttypes_netpbm.h"
-
-# HAVE_INT64 tells whether, assuming you include the header indicated by
-# INTTYPES_H, you have the int64_t type and related stuff. (If you don't
-# the build will omit certain code that does 64 bit computations).
-HAVE_INT64 = Y
-#HAVE_INT64 = N
-
-# CC and LD are for building the Netpbm programs, which are not necessarily
-# intended to run on the same system on which Make is running. But when we
-# build a build tool such as Libopt, it is meant to run only on the same
-# system on which the Make is running. The variables below define programs
-# to use to compile and link build tools.
-CC_FOR_BUILD = $(CC)
-LD_FOR_BUILD = $(LD)
-CFLAGS_FOR_BUILD = $(CFLAGS)
-LDFLAGS_FOR_BUILD = $(LDFLAGS)
-
-# MAKE is set automatically by Make to what was used to invoke Make.
-
-INSTALL = $(SRCDIR)/buildtools/install.sh
-#Solaris:
-#INSTALL = /usr/ucb/install
-#Tru64:
-#INSTALL = installbsd
-#OSF1:
-#INSTALL = $(SRCDIR)/buildtools/installosf
-#Red Hat Linux:
-#INSTALL = install
-
-# STRIPFLAG is the option you pass to the above install program to make it
-# strip unnecessary information out of binaries.
-STRIPFLAG = -s
-# If you don't want to strip the binaries, just leave it null:
-#STRIPFLAG =
-
-SYMLINK = ln -s
-# At least some Windows environments don't have any concept of symbolic
-# links, but direct copies are usually a passable alternative.
-#SYMLINK = cp
-
-#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the
-#pointer man pages are installed (ready to nroff, or ready to cat).
-#A pointer man pages is just a single-paragraph pages that tells you there is
-#no man page for the program, to look at the HTML documentation instead.
-MANPAGE_FORMAT = nroff
-#MANPAGE_FORMAT = cat
-
-AR = ar
-RANLIB = ranlib
-# IRIX, SCO don't have Ranlib:
-#RANLIB = true
-
-# LEX is the beginning of a shell command that runs a Lex-like
-# pattern matcher generator. Null string means there isn't any such
-# command. That means the build will skip parts that need one.
-
-LEX = flex
-# Solaris:
-# LEX = flex -e
-# Windows Mingw:
-# LEX =
-#
-# LEX = lex
-
-# C compiler options
-
-# gcc:
-# -ansi and -Werror should work too, but are not included
-# by default because there's no point in daring the build to fail.
-# -pedantic isn't a problem because it causes at worst a warning.
-#CFLAGS = -O3 -ffast-math -pedantic -fno-common \
-# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \
-# -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas
-# The merged programs have a main_XXX subroutine instead of main(),
-# which would cause a warning with -Wmissing-declarations or
-# -Wmissing-prototypes.
-#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
-# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg,
-# but word size-sensitive code was removed from parallel.c in September 2004.
-# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In
-# theory, you need this if on your system, long is 32 bits and int is not.
-# But it may be completely irrelevant today.
-#Tru64:
-#CFLAGS = -O2 -std1 -DLONG_32
-#CFLAGS = -O2 -std1
-#AIX:
-#CFLAGS= -O3
-#HP-UX:
-#CFLAGS= -O3 -fPIC
-#IRIX:
-#CFLAGS= -n32 -O3
-#Amiga with GNU compiler:
-#CFLAGS= -m68020-60 -ffast-math -mstackextend
-# You can add -noixemul for Amiga and successfully compile most of the
-# programs. (Of the remaining ones, if you can supply your own strtod()
-# function, most of them will build with -noixemul). So try building
-# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build
-# everything that failed for lack of the ixemul library in the first step.
-# That way, the parts that don't required the ixemul library won't indicate
-# a dependency on it.
-#OpenBSD:
-#CFLAGS = -I/usr/local/include
-
-# EXE is a suffix that the linker puts on any executable it generates.
-# In cygwin, this is .exe and most programs deal with its existence without
-# us having to know about it. Some don't though, so set this:
-
-EXE =
-#Cygwin, DJGPP/Windows:
-#EXE = .exe
-
-# linker options.
-
-# LDFLAGS is often set as an environment variable; A setting here overrides
-# it. So either make sure you want to override it, or do a "LDFLAGS +=" here.
-
-# LDFLAGS is usually not the right place for a -L option, because we put
-# LDFLAGS _before_ our own -L options, so it would cancel out our
-# specific selection of libraries. For example, if you say
-# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in
-# /usr/local/lib, then you'd be linking against that old copy instead of
-# the copy you just built, which is located by a -L option later on the
-# link command. LIBS is the right variable for adding -L options. LIBS
-# goes after any of our make files' own -L options.
-
-# Eunice users may want to use -noshare so that the executables can
-# run standalone:
-#LDFLAGS += -noshare
-#Tru64:
-# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary
-# to keep from finding an ancient system libjpeg.so that isn't compatible with
-# NetPBM. Michael Long found that /usr/local/lib is not in the default
-# search path, or not soon enough, and he was getting an old libjpeg that
-# caused all the jpeg symbol references to be unresolved. He had installed
-# a new libjpeg in /usr/local/lib.
-#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib
-#AIX:
-#LDFLAGS += -L /usr/pubsw/lib
-#HP-UX:
-#LDFLAGS += -Wl,+b,/usr/pubsw/lib
-#IRIX:
-#LDFLAGS += -n32
-
-# Linker options for created Netpbm shared libraries.
-
-# Here, $(SONAME) resolves to the soname for the shared library being created.
-# The following are gcc options. This works on GNU libc systems.
-LDSHLIB = -shared -Wl,-soname,$(SONAME)
-# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is
-# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
-# documentation and doesn't exist in at least one non-BeOS installation.
-# BeOS doesn't have sonames built in.
-#LDSHLIB = -nostart
-#LDSHLIB = -G
-# Solaris, SunOS with GNU Ld, SCO:
-# These systems have no soname option.
-#LDSHLIB = -shared
-# Solaris with Sun Ld:
-#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
-#Tru64:
-#LDSHLIB = -shared -expect_unresolved "*"
-#IRIX:
-#LDSHLIB = -shared -n32
-#AIX GNU compiler/linker:
-#LDSHLIB = -shared
-#AIX Visual Age C:
-#LDSHLIB = -qmkshrobj
-#Mac OSX:
-# According to experiments done by Peter A Crowley in May 2007, if
-# libnetpbm goes in a standard place such as /usr/local/lib,
-# programs need not be built with libnetpbm's location included.
-# But if it goes elsewhere, the link-editor must include the
-# location in the executable. It finds the runtime location by
-# looking inside the library. The information in the library
-# comes from the install_name option with which the library was
-# built. It's an alternative to the -rpath option on other systems.
-#LDSHLIB=-dynamiclib
-#LDSHLIB=-dynamiclib -install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
-
-# LDRELOC is the command to combine two .o files (relocateable object files)
-# into a single .o file that can later be linked into something else. NONE
-# means no such command is available.
-
-LDRELOC = NONE
-# GNU Ld:
-# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld
-# correctly spells it --relocatable. The abbreviation --reloc works on
-# both.
-#LDRELOC = ld --reloc
-#LDRELOC = ld -r
-
-
-# On older systems, you have to make shared libraries out of position
-# independent code, so you need -fpic or fPIC here. (The rule is: if
-# -fpic works, use it. If it bombs, go to fPIC). On newer systems,
-# it isn't necessary, but can save real memory at the expense of
-# execution speed. Without position independent code, the library
-# loader may have to patch addresses into the executable text. On an
-# older system, this would cause a program crash because the loader
-# would be writing into read-only shared memory. But on newer
-# systems, the system silently creates a private mapping of the page
-# or segment being modified (the "copy on write" phenomenon). So it
-# needs its own private real page frame. In one experiment, A second
-# copy of Pbmtext used 16K less real memory when built with -fpic than
-# when built without. 2001.06.02.
-
-# We have seen -fPIC required on IA64 and AMD64 machines (GNU
-# compiler/linker). Build-time linking fails without it. I don't
-# know why -- history seems to be repeating itself. 2005.02.23.
-
-CFLAGS_SHLIB =
-# Gcc:
-#CFLAGS_SHLIB = -fpic
-#CFLAGS_SHLIB = -fPIC
-# Sun compiler:
-#CFLAGS_SHLIB = -Kpic
-#CFLAGS_SHLIB = -KPIC
-
-# SHLIB_CLIB is the link option to include the C library in a shared library,
-# normally "-lc". On typical systems, this serves no purpose. On some,
-# though, it causes information about which C library to use to be recorded
-# in the shared library and thus choose the correct library among several or
-# avoid using an incompatible one. But on some systems, the link fails.
-# On 2002.09.30, "John H. DuBois III" <spcecdt(a)armory.com> reports that on
-# SCO OpenServer, he gets the following error message with -lc:
-#
-# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o);
-# fatal error: relocations remain against allocatable but non-writable
-# section: ; .text
-
-SHLIB_CLIB = -lc
-# SCO:
-#SHLIB_CLIB =
-
-# On some systems you have to build into an executable the list of
-# directories where its dynamically linked libraries can be found at
-# run time. This is typically done with a -R or -rpath linker
-# option. Even on systems that don't require it, you might prefer to do
-# that rather than set up environment variables or configuration files
-# to tell the system where the libraries are. A "Y" here means to put
-# the directory information in the executable at link time.
-
-NEED_RUNTIME_PATH = N
-# Solaris, SunOS, NetBSD, AIX:
-#NEED_RUNTIME_PATH = Y
-
-# RPATHOPTNAME is the option you use on the link command to specify
-# a runtime search path for a shared library. It is meaningless unless
-# NEED_RUNTIME_PATH is Y.
-RPATHOPTNAME = -rpath
-
-# The following variables tell where your various libraries on which
-# Netpbm depends live. The LIBxxx variable is a full file
-# specification of the link library (not necessarily the library used
-# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually
-# doesn't matter if the library prefix and suffix are right -- you can
-# use "lib" and ".so" or ".a" regardless of what your system actually
-# uses because these just turn into "-L" and "-l" linker options
-# anyway. ".a" implies a static library for some purposes, though.
-# If you don't have the library in question, use a value of NONE for
-# LIBxxx and the build will simply skip the programs that require that
-# library. If the library is in your linker's (or the Netpbm build's)
-# default search path, leave off the directory part, e.g. "libjpeg.so".
-
-# The xxxHDR_DIR variable is the directory in which the interface
-# headers for the library live (e.g. /usr/include). If they are in your
-# compiler's default search path, set this variable to null.
-
-# This is where the Netpbm shared libraries will reside when Netpbm is
-# fully installed. In some configurations, the Netpbm builder builds
-# this information into the Netpbm executables. This does NOT affect
-# where the Netpbm installer installs the libraries. A null value
-# means the libraries are in a default search path used by the runtime
-# library loader.
-NETPBMLIB_RUNTIME_PATH =
-#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm
-
-# The TIFF library. See above. If you want to build the tiff
-# converters, you must have the tiff library already installed.
-
-TIFFLIB = NONE
-TIFFHDR_DIR =
-
-#TIFFLIB = libtiff.so
-#TIFFHDR_DIR = /usr/include/libtiff
-#NetBSD:
-#TIFFLIB = $(LOCALBASE)/lib/libtiff.so
-#TIFFHDR_DIR = $(LOCALBASE)/include
-# OSF, Tru64:
-#TIFFLIB = /usr/local1/DEC/lib/libtiff.so
-#TIFFHDR_DIR = /usr/local1/DEC/include
-
-# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any
-# program linked with the TIFF library needs a Jpeg and/or Z library.
-# Some TIFF libraries have such library statically linked in, but others
-# need it to be dynamically linked at program load time.
-# Make this 'N' if youf TIFF library doesn't need such dynamic linking.
-# As of 2005.01, the most usual build of the TIFF library appears to require
-# both.
-TIFFLIB_NEEDS_JPEG = Y
-TIFFLIB_NEEDS_Z = Y
-
-# The JPEG library. See above. If you want to build the jpeg
-# converters you must have the jpeg library already installed.
-
-# Tiff files can use JPEG compression, so the Tiff library can reference
-# the JPEG library. If your Tiff library references a dynamic JPEG
-# library, you must specify at least JPEGLIB here, or the Tiff
-# converters will not build. Note that your Tiff library may have the
-# JPEG stuff statically linked in, in which case you won't need
-# JPEGLIB in order to build the Tiff converters.
-
-JPEGLIB = NONE
-JPEGHDR_DIR =
-#JPEGLIB = libjpeg.so
-#JPEGHDR_DIR = /usr/include/jpeg
-# Netbsd:
-#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
-#JPEGHDR_DIR = ${LOCALBASE}/include
-# OSF, Tru64:
-#JPEGLIB = /usr/local1/DEC/libjpeg.so
-#JPEGHDR_DIR = /usr/local1/DEC/include
-# Typical:
-#JPEGLIB = /usr/local/lib/libjpeg.so
-#JPEGHDR_DIR = /usr/local/include
-# Don't build JPEG stuff:
-#JPEGLIB = NONE
-
-
-# The PNG library. See above. If you want to build the PNG
-# converters you must have the PNG library already installed.
-
-# The PNG library, by convention starting around April 2002, gets installed
-# with names that include a version number, such as libpng10.a and header
-# files in /usr/include/libpng10. But there is conventionally an unnumbered
-# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version.
-#
-# Recent versions of the library (since some time in the 2002-2006 period)
-# have an associated 'libpng-config' that tells how to link it. The make
-# files will use that program if it exists (must be in the PATH). In that
-# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful,
-# because the make file runs 'libpng$(PNGVER)-config'.
-#
-# Even more recent versions have the more modern Pkgconfig database entry
-# to tell how to link it. The make files will try to use that first.
-#
-# The normal way to choose the libpng the Netpbm build uses from among multiple
-# versions on your system is not to mess with the variables below, but rather
-# to mess with PKG_CONFIG_PATH or PATH environment variable so that the version
-# you want to use appears first in the search path.
-
-PNGLIB = NONE
-PNGHDR_DIR =
-PNGVER =
-#PNGLIB = libpng$(PNGVER).so
-#PNGHDR_DIR = /usr/include/libpng$(PNGVER)
-# NetBSD:
-#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so
-#PNGHDR_DIR = $(LOCALBASE)/include
-# OSF/Tru64:
-#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
-#PNGHDR_DIR = /usr/local1/DEC/include
-
-# The zlib compression library. See above. You need it to build
-# anything that needs the PNG library (see above). If you selected
-# NONE for the PNG library, it doesn't matter what you specify here --
-# it won't get used.
-#
-# If you have 'libpng-config' (see above), these are irrelevant.
-
-ZLIB = NONE
-ZHDR_DIR =
-#ZLIB = libz.so
-
-# The JBIG lossless image compression library (aka JBIG-KIT):
-
-JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
-JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
-
-# The Jasper JPEG-2000 image compression library (aka JasPer):
-JASPERLIB = $(INTERNAL_JASPERLIB)
-JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
-# JASPERDEPLIBS is the libraries (-l options or file names) on which
-# The Jasper library depends -- i.e. what you have to link into any
-# executable that links in the Jasper library.
-JASPERDEPLIBS =
-#JASPERDEPLIBS = -ljpeg
-
-# And the Utah Raster Toolkit (aka URT aka RLE) library:
-
-URTLIB = $(BUILDDIR)/urt/librle.a
-URTHDR_DIR = $(SRCDIR)/urt
-
-# The X11 library has facilities for talking to an X Window System
-# server. It is required by Pamx.
-
-X11LIB = NONE
-X11HDR_DIR =
-
-#X11LIB = /usr/lib/libX11.so
-#X11HDR_DIR =
-
-# The Linux SVGA library (Svgalib) is a facility for displaying graphics
-# on the Linux console. It is required by Ppmsvgalib.
-
-LINUXSVGALIB = NONE
-LINUXSVGAHDR_DIR =
-
-#LINUXSVGALIB = /usr/lib/libvga.so
-#LINUXSVGAHDR_DIR = /usr/include/vgalib
-
-# If you don't want any network functions, set OMIT_NETWORK to "y".
-# The only thing that requires network functions is the option in
-# ppmtompeg to run it on multiple computers simultaneously. On some
-# systems network functions don't work or we haven't figured out how to
-# make them work, or they just aren't worth the effort.
-OMIT_NETWORK =
-#DJGPP/Windows, Tru64:
-# (there's some minor header problem that prevents network functions from
-# building on Tru64 2000.10.06)
-#OMIT_NETWORK = y
-
-# These are -l options to link in the network libraries. Often, these are
-# built into the standard C library, so this can be null. This is irrelevant
-# if OMIT_NETWORK is "y".
-
-NETWORKLD =
-# Solaris, SunOS:
-#NETWORKLD = -lsocket -lnsl
-# SCO:
-#NETWORKLD = -lsocket, -lresolv
-
-# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual
-# Unix process management stuff - fork, wait, etc. N for a regular Unix
-# system.
-DONT_HAVE_PROCESS_MGMT = N
-
-# The following variables are used only by 'make install' (and the
-# variants of it). Paths here don't, for example, get built into any
-# programs.
-
-# This is where everything goes when you do 'make package', unless you
-# override it by setting 'pkgdir' on the Make command line.
-PKGDIR_DEFAULT = /tmp/netpbm
-
-# Subdirectory of the package directory ($(pkgdir)) in which man pages
-# go.
-PKGMANDIR = man
-
-# File permissions for installed files.
-# Note that on some systems (e.g. Solaris), 'install' can't use the
-# mnemonic permissions - you have to use octal.
-
-# binaries (pbmmake, etc)
-INSTALL_PERM_BIN = 755 # u=rwx,go=rx
-# shared libraries (libpbm.so, etc)
-INSTALL_PERM_LIBD = 755 # u=rwx,go=rx
-# static libraries (libpbm.a, etc)
-INSTALL_PERM_LIBS = 644 # u=rw,go=r
-# header files (pbm.h, etc)
-INSTALL_PERM_HDR = 644 # u=rw,go=r
-# man pages (pbmmake.1, etc)
-INSTALL_PERM_MAN = 644 # u=rw,go=r
-# data files (pnmtopalm color maps, etc)
-INSTALL_PERM_DATA = 644 # u=rw,go=r
-
-# Specify the suffix that want the man pages to have.
-
-SUFFIXMANUALS1 = 1
-SUFFIXMANUALS3 = 3
-SUFFIXMANUALS5 = 5
-
-#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the
-#Netpbm library functions. The value is used only in make file tests.
-# "unixshared" means a unix-style shared library, typically named like
-# libxyz.so.2.3
-NETPBMLIBTYPE = unixshared
-# "unixstatic" means a unix-style static library, (like libxyz.a)
-#NETPBMLIBTYPE = unixstatic
-# "dll" means a Windows DLL shared library
-#NETPBMLIBTYPE = dll
-# "dylib" means a Darwin/Mac OS shared library
-#NETPBMLIBTYPE = dylib
-
-#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is
-#selected above. All this is used for is to construct library names.
-#The make files never examine the actual value.
-NETPBMLIBSUFFIX = so
-
-# "a" is the suffix for unix-style static libraries. It is also
-# traditionally used for shared libraries on AIX. The Visual Age C
-# manual says sometimes .so works on AIX, and GNU software for AIX
-# 5.1.0 does indeed use it. In our experiments, it works fine if you
-# name the library file explicitly on the link, but isn't in the -l
-# search order. If you name the library explicitly on the link, the
-# library must live in exactly the same position at run time, so we
-# can't use that. Therefore, you cannot build both static and shared
-# libraries with AIX. You have to choose.
-#NETPBMLIBSUFFIX = a
-# For HP-UX shared libraries:
-#NETPBMLIBSUFFIX = sl
-# Darwin/Mac OS shared library:
-#NETPBMLIBSUFFIX = dylib
-# Windows shared library:
-#NETPBMLIBSUFFIX = dll
-
-#STATICLIB_TOO is "y" to signify that you want a static library built
-#and installed in addition to whatever library type you specified by
-#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library,
-#STATICLIB_TOO simply has no effect.
-STATICLIB_TOO = y
-#STATICLIB_TOO = n
-
-#STATICLIBSUFFIX is the suffix that static libraries have. It's
-#meaningless if you aren't building static libraries.
-STATICLIBSUFFIX = a
-
-#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename
-#of a shared library may have on this system. Traditionally, it's
-#just "lib", as in libc or libnetpbm. On Windows, though, varying
-#prefixes are used when multiple alternative forms of a library are
-#available. The first prefix in this list is what we use to name the
-#Netpbm shared libraries.
-#
-# This variable controls how 'libopt' gets built.
-#
-SHLIBPREFIXLIST = lib
-#Cygwin:
-#SHLIBPREFIXLIST = cyg lib
-
-NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
-
-#DLLVER is used to version the DLLs built on cygwin or other
-#windowsish platforms. We can't add this to LIBROOT, or we'd
-#version the static libs (which is bad). We can't add this
-#at the end of the name (like unix does with so numbers) because
-#windows will only load dlls whose name ends in "dll". So,
-#we have this variable, which becomes the end of the library "root" name
-#for DLLs only.
-#
-# This variable controls how 'libopt' gets built.
-#
-DLLVER =
-#Cygwin
-#DLLVER = $(NETPBM_MAJOR_RELEASE)
-
-#NETPBM_DOCURL is the URL of the main documentation page for Netpbm.
-#This is a directory which contains a file for each Netpbm program,
-#library, and file type. E.g. The documentation for jpegtopnm might be in
-#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets
-#installed in the man pages (which say no more than to read the webpage)
-#and in the Webman netpbm.url file.
-NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
-#For a system with no web access, but a local copy of the doc:
-#NETPBM_DOCURL = file:/usr/doc/netpbm/
-
-
-
-
-
-####Lines above were copied from config.mk.in by 'configure'.
-####Lines below were added by 'configure' based on the GNU platform.
-DEFAULT_TARGET = nonmerge
-NETPBMLIBTYPE=unixshared
-NETPBMLIBSUFFIX=so
-STATICLIB_TOO=y
-CFLAGS = #CFLAGS# -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas
-CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
-LDRELOC = ld --reloc
-LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
-LINKERISCOMPILER = Y
-CFLAGS_SHLIB += -fPIC
-TIFFLIB = libtiff.so
-JPEGLIB = libjpeg.so
-ZLIB = libz.so
-NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
diff --git a/netpbm/netpbm-10.34-build.patch b/netpbm/netpbm-10.34-build.patch
deleted file mode 100644
index 0db5988..0000000
--- a/netpbm/netpbm-10.34-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur netpbm-10.34.orig/buildtools/libopt.c netpbm-10.34/buildtools/libopt.c
---- netpbm-10.34.orig/buildtools/libopt.c 2006-09-01 10:37:09.000000000 +0200
-+++ netpbm-10.34/buildtools/libopt.c 2006-09-01 10:37:20.000000000 +0200
-@@ -502,7 +502,7 @@
-
- strcpy(outputLine, ""); /* initial value */
- runtime = FALSE; /* initial value */
-- quiet = FALSE; /* initial value */
-+ quiet = TRUE; /* initial value */
- error = FALSE; /* no error yet */
- for (arg = 1; arg < argc && !error; arg++) {
- if (strcmp(argv[arg], "-runtime") == 0)
-diff -Naur netpbm-10.34.orig/GNUmakefile netpbm-10.34/GNUmakefile
---- netpbm-10.34.orig/GNUmakefile 2006-09-01 10:37:09.000000000 +0200
-+++ netpbm-10.34/GNUmakefile 2006-09-01 10:37:20.000000000 +0200
-@@ -87,6 +87,9 @@
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-+
- OMIT_CONFIG_RULE = 1
- OMIT_VERSION_H_RULE = 1
- OMIT_INTTYPES_RULE = 1
-diff -Naur netpbm-10.34.orig/lib/Makefile netpbm-10.34/lib/Makefile
---- netpbm-10.34.orig/lib/Makefile 2006-09-01 10:37:09.000000000 +0200
-+++ netpbm-10.34/lib/Makefile 2006-09-01 10:37:20.000000000 +0200
-@@ -244,7 +244,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -252,9 +252,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
1
0
Hi, it is a usb local printer that is recognized by system but not found
when I try to add it by running localhost:631>manage printers or >find new
printer
I tried many ways and I noticed the print is recognized:
bash-4.3# /usr/lib/cups/backend/usb
DEBUG: Loading USB quirks from "/usr/share/cups/usb".
DEBUG: Loaded 114 quirks.
DEBUG: list_devices
DEBUG: libusb_get_device_list=16
DEBUG2: Printer found with device ID:
MFG:Samsung;CMD:SPL,URF,FAX,FWV,PIC,DCU,EXT;MDL:SCX-3400
Series;CLS:PRINTER;MODE:FAX3,SCN,SPL3,R000105;STATUS:BUSY; Device URI:
usb://Samsung/SCX-3400%20Series?serial=Z6YMBQAD600274D&interface=1
direct usb://Samsung/SCX-3400%20Series?serial=Z6YMBQAD600274D&interface=1
"Samsung SCX-3400 Series" "Samsung SCX-3400 Series"
"MFG:Samsung;CMD:SPL,URF,FAX,FWV,PIC,DCU,EXT;MDL:SCX-3400
Series;CLS:PRINTER;MODE:FAX3,SCN,SPL3,R000105;STATUS:BUSY;" ""
bash-4.3# cupsd
bash-4.3# lsusb
Bus 007 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub
Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
Bus 006 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub
Bus 005 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub
Bus 001 Device 006: ID 046d:0825 Logitech, Inc. Webcam C270
Bus 001 Device 007: ID 04e8:344f Samsung Electronics Co., Ltd SCX-3400
Series
when I run the command below the return is :
bash-4.3# lpinfo -v
network socket
network ipps
network https
network lpd
network ipp
network http
bash-4.3#
I have downloaded the driver and installed it. it was useless...
tks in advance for those who print and maybe have an idea.
1
0
commit b96b04a12f2794b290a78ef09cc0d7b719c526a5
Author: Juergen Daubert <jue(a)jue.li>
Date: Fri Feb 20 12:06:04 2015 +0100
[notify] php: update to 5.5.22
includes two security fixes, see http://php.net/ChangeLog-5.php#5.5.22
diff --git a/php/.md5sum b/php/.md5sum
index 37b224c..1485f77 100644
--- a/php/.md5sum
+++ b/php/.md5sum
@@ -1 +1 @@
-79664ce44f7c93f355a25a3fe3dcc91b php-5.5.21.tar.xz
+fb1704131d495f5b3e6ab3b087a8dbe6 php-5.5.22.tar.xz
diff --git a/php/Pkgfile b/php/Pkgfile
index 786d176..ccaad81 100644
--- a/php/Pkgfile
+++ b/php/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: readline libpcre libxml2 curl db gdbm xz
name=php
-version=5.5.21
+version=5.5.22
release=1
source=(http://php.net/distributions/php-$version.tar.xz)
1
0