February 2016 - CRUX - lists.crux.nu

Easier patching with pkgmk
by Willy Goiffon 26 May '16

26 May '16

Hi everyone, I had an idea to make software patching easier, and lower the need to fork ports. Sometimes, I just fork some port from contrib because I want to add a patch (eg: thttpd), or I need to modify a file before actually compiling the software (eg: config.h on contrib/st). I figured out that by adding a single variable to `/etc/pkgmk.conf`, it would be easier to "tweak" sofwares by patching them beforehand: ``` /etc/pkgmk.conf [...] PKGMK_PATCH_DIR=/usr/patch And then, have ports include something like: ``` /usr/port/contrib/example/PKgfile [...] cd $name-$version cat $PKGMK_PATCH_DIR/$name/*.diff | patch -Np1 make make DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man install So if I need a patch for thttpd, I'll just add it to `/usr/patch/thttpd`. To have the `st` port configured with my `config.h`, I'll just create a patch for it in `/usr/patch/st`. All ports might not need this obviously, but this could result in a simple and efficient way to let user tweak packages from the "official" port trees without any need to actually fork them, and double the effort. What do you think about it? -- Willy Goiffon (z3bra on #crux)

5 6

Re: 3.2 upgrade: pkgadd and directory symlinks
by Daniel Kruszyna 28 Feb '16

28 Feb '16

Erich Eckner <crux(a)eckner.net> wrote: > On 26.01.2016 03:19, Daniel Kruszyna wrote: > > I recently upgraded to 3.2. Some of my top-level directories are > > symlinks. The upgrade process replaced the symlinks with actual > > directories. Is there a way to configure pkgadd to ignore certain > > directories? I put the following in my /etc/pkgadd.conf before the > > upgrade: > > > > UPGRADE ^boot$ NO > > UPGRADE ^home$ NO > > > > Is that syntax correct? > > in principle, I would think your syntax is correct, but maybe a "/" at > the end is missing. At least there's a slash in the .footprint files. I upgraded another machine and tried adding a slash. Unfortunately, the symlinks are still replaced with directories. -- Daniel

1 0

ports/opt (3.2): [notify] wine: 1.9.2 -> 1.9.4 requires gcc48 to build
by crux＠crux.nu 25 Feb '16

25 Feb '16

commit 053f6d67f989dbb92a109fc0c6def7aed0c57cb3 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Feb 25 19:23:02 2016 +1100 [notify] wine: 1.9.2 -> 1.9.4 requires gcc48 to build diff --git a/wine/.footprint b/wine/.footprint index 5d6bdd4..6b1a158 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -146,6 +146,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ -rw-r--r-- root/root usr/include/wine/windows/clusapi.h -rw-r--r-- root/root usr/include/wine/windows/cmdbas.idl -rw-r--r-- root/root usr/include/wine/windows/cmdtxt.idl +-rw-r--r-- root/root usr/include/wine/windows/colinf.idl -rw-r--r-- root/root usr/include/wine/windows/comcat.h -rw-r--r-- root/root usr/include/wine/windows/comcat.idl -rw-r--r-- root/root usr/include/wine/windows/commctrl.h @@ -326,6 +327,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/dwrite_1.idl -rw-r--r-- root/root usr/include/wine/windows/dwrite_2.h -rw-r--r-- root/root usr/include/wine/windows/dwrite_2.idl +-rw-r--r-- root/root usr/include/wine/windows/dwrite_3.h +-rw-r--r-- root/root usr/include/wine/windows/dwrite_3.idl -rw-r--r-- root/root usr/include/wine/windows/dxdiag.h -rw-r--r-- root/root usr/include/wine/windows/dxerr8.h -rw-r--r-- root/root usr/include/wine/windows/dxerr9.h @@ -809,6 +812,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/winuser.h -rw-r--r-- root/root usr/include/wine/windows/winuser.rh -rw-r--r-- root/root usr/include/wine/windows/winver.h +-rw-r--r-- root/root usr/include/wine/windows/wlanapi.h -rw-r--r-- root/root usr/include/wine/windows/wmistr.h -rw-r--r-- root/root usr/include/wine/windows/wmiutils.h -rw-r--r-- root/root usr/include/wine/windows/wmiutils.idl @@ -865,11 +869,13 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/advpack.dll.so -rwxr-xr-x root/root usr/lib/wine/amstream.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-com-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-com-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-console-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-debug-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-debug-l1-1-1.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-delayload-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-errorhandling-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so @@ -887,8 +893,11 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-interlocked-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-io-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-localization-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-localization-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-localization-l1-2-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so @@ -916,6 +925,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-threadpool-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-timezone-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-url-l1-1-0.dll.so @@ -923,7 +933,9 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-wow64-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-crt-conio-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-crt-convert-l1-1-0.dll.so @@ -949,6 +961,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-downlevel-version-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-security-base-l1-1-0.dll.so @@ -1120,11 +1133,13 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/advpack.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/amstream.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-com-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-debug-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-delayload-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll @@ -1142,8 +1157,11 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-localization-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll @@ -1171,6 +1189,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll @@ -1178,7 +1197,9 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll @@ -1204,6 +1225,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll @@ -1389,6 +1411,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/hnetcfg.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/hostname.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/httpapi.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/icacls.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/iccvid.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/icinfo.exe -rw-r--r-- root/root usr/lib/wine/fakedlls/icmp.dll @@ -1451,6 +1474,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/msdaps.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/msdelta.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/msdmo.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/msdrm.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/msftedit.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/msg711.acm -rw-r--r-- root/root usr/lib/wine/fakedlls/msgsm32.acm @@ -1741,6 +1765,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/hnetcfg.dll.so -rwxr-xr-x root/root usr/lib/wine/hostname.exe.so -rwxr-xr-x root/root usr/lib/wine/httpapi.dll.so +-rwxr-xr-x root/root usr/lib/wine/icacls.exe.so -rwxr-xr-x root/root usr/lib/wine/iccvid.dll.so -rwxr-xr-x root/root usr/lib/wine/icinfo.exe.so -rwxr-xr-x root/root usr/lib/wine/icmp.dll.so @@ -1985,6 +2010,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rwxr-xr-x root/root usr/lib/wine/msdaps.dll.so -rwxr-xr-x root/root usr/lib/wine/msdelta.dll.so -rwxr-xr-x root/root usr/lib/wine/msdmo.dll.so +-rwxr-xr-x root/root usr/lib/wine/msdrm.dll.so -rwxr-xr-x root/root usr/lib/wine/msftedit.dll.so -rwxr-xr-x root/root usr/lib/wine/msg711.acm.so -rwxr-xr-x root/root usr/lib/wine/msgsm32.acm.so @@ -2265,11 +2291,13 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/advpack.dll.so -rwxr-xr-x root/root usr/lib32/wine/amstream.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-com-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-com-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-console-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-debug-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-debug-l1-1-1.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-delayload-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-errorhandling-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so @@ -2287,8 +2315,11 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-interlocked-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-io-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-kernel32-legacy-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-localization-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-localization-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so @@ -2316,6 +2347,7 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-threadpool-l1-2-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-timezone-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-url-l1-1-0.dll.so @@ -2323,7 +2355,9 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-wow64-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-crt-conio-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-crt-convert-l1-1-0.dll.so @@ -2349,6 +2383,7 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-downlevel-version-l1-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-eventing-classicprovider-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-eventing-provider-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-security-base-l1-1-0.dll.so @@ -2529,11 +2564,13 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/advpack.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/amstream.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-com-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-debug-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-delayload-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll @@ -2551,8 +2588,11 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-interlocked-l1-2-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-localization-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll @@ -2580,6 +2620,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll @@ -2587,7 +2628,9 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-crt-conio-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-crt-convert-l1-1-0.dll @@ -2613,6 +2656,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-eventing-classicprovider-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll @@ -2808,6 +2852,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/hnetcfg.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/hostname.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/httpapi.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/icacls.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/iccvid.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/icinfo.exe -rw-r--r-- root/root usr/lib32/wine/fakedlls/icmp.dll @@ -2880,6 +2925,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/msdaps.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/msdelta.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/msdmo.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/msdrm.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/msftedit.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/msg711.acm -rw-r--r-- root/root usr/lib32/wine/fakedlls/msgsm32.acm @@ -3214,6 +3260,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/hnetcfg.dll.so -rwxr-xr-x root/root usr/lib32/wine/hostname.exe.so -rwxr-xr-x root/root usr/lib32/wine/httpapi.dll.so +-rwxr-xr-x root/root usr/lib32/wine/icacls.exe.so -rwxr-xr-x root/root usr/lib32/wine/iccvid.dll.so -rwxr-xr-x root/root usr/lib32/wine/icinfo.exe.so -rwxr-xr-x root/root usr/lib32/wine/icmp.dll.so @@ -3470,6 +3517,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rwxr-xr-x root/root usr/lib32/wine/msdaps.dll.so -rwxr-xr-x root/root usr/lib32/wine/msdelta.dll.so -rwxr-xr-x root/root usr/lib32/wine/msdmo.dll.so +-rwxr-xr-x root/root usr/lib32/wine/msdrm.dll.so -rwxr-xr-x root/root usr/lib32/wine/msftedit.dll.so -rwxr-xr-x root/root usr/lib32/wine/msg711.acm.so -rwxr-xr-x root/root usr/lib32/wine/msgsm32.acm.so @@ -3865,8 +3913,8 @@ drwxr-xr-x root/root usr/share/wine/fonts/ -rw-r--r-- root/root usr/share/wine/fonts/vgasyst.fon -rw-r--r-- root/root usr/share/wine/fonts/wingding.ttf drwxr-xr-x root/root usr/share/wine/gecko/ --rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.40-x86.msi --rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.40-x86_64.msi +-rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.44-x86.msi +-rwxr-xr-x root/root usr/share/wine/gecko/wine_gecko-2.44-x86_64.msi -rw-r--r-- root/root usr/share/wine/l_intl.nls drwxr-xr-x root/root usr/share/wine/mono/ -rwxr-xr-x root/root usr/share/wine/mono/wine-mono-4.5.6.msi diff --git a/wine/.md5sum b/wine/.md5sum index 576f373..658ab83 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,4 +1,4 @@ -13c74ba8b92a72cd6d7d79168ed9eaae wine-1.9.2.tar.bz2 +28e703edf86a9fb9f6b11bf61b9e0d1d wine-1.9.4.tar.bz2 6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi -66fa7ceca8c0aa84c6a2db8672a743b6 wine_gecko-2.40-x86.msi -5e5d242e52e885190a0fe02a2e38a987 wine_gecko-2.40-x86_64.msi +f6ff2bb5dddc144726bd9a955fb16649 wine_gecko-2.44-x86.msi +59e7a37dcdc87f5e4f030bfafbb1c0d6 wine_gecko-2.44-x86_64.msi diff --git a/wine/Pkgfile b/wine/Pkgfile index 1d8ebfb..c85b03e 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -2,20 +2,21 @@ # URL: http://www.winehq.com/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Daniel Walpole, daniel at walpole dot id dot au -# Depends on:fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32 +# Depends on:fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32 gcc48 name=wine -version=1.9.2 +version=1.9.4 release=1 source=(https://dl.winehq.org/wine/source/1.9/$name-$version.tar.bz2 - http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi - http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86_64.msi + http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86.msi + http://dl.winehq.org/wine/wine-gecko/2.44/wine_gecko-2.44-x86_64.msi http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi) build() { install -d wine32 wine64 export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + export CC='gcc-4.8' CXX='g++-4.8' cd wine64 @@ -50,8 +51,8 @@ build() { install -d $PKG/usr/share/wine/mono install -t $PKG/usr/share/wine/gecko/ \ - $SRC/wine_gecko-2.40-x86.msi \ - $SRC/wine_gecko-2.40-x86_64.msi + $SRC/wine_gecko-2.44-x86.msi \ + $SRC/wine_gecko-2.44-x86_64.msi install $SRC/wine-mono-4.5.6.msi $PKG/usr/share/wine/mono/

1 0

ports/opt (3.2): [notify] chromium: updated to 48.0.2564.116
by crux＠crux.nu 21 Feb '16

21 Feb '16

commit a6d78caf71a09dc7ed3f6ca8bb103b530989ad38 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Sun Feb 21 09:21:22 2016 +0000 [notify] chromium: updated to 48.0.2564.116 This update includes security fixes: http://googlechromereleases.blogspot.com/2016/02/stable-channel-update_18.h… diff --git a/chromium/.md5sum b/chromium/.md5sum index 071baae..ddc1200 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -1112016e382f2b8226384fe4bf1301e0 chromium-48.0.2564.97.tar.xz +87d827c19dbc64f20b3494333aedf64b chromium-48.0.2564.116.tar.xz b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh diff --git a/chromium/Pkgfile b/chromium/Pkgfile index a6c44cc..a481cfb 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,7 +5,7 @@ # Depends on: ninja dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher libdrm libexif pciutils name=chromium -version=48.0.2564.97 +version=48.0.2564.116 release=1 source=(http://commondatastorage.googleapis.com/$name-browser-official/$nam… \ $name.sh $name.desktop)

1 0

ports/core (3.2): [notify] glibc: added patches for CVE-2015-7547.
by crux＠crux.nu 16 Feb '16

16 Feb '16

commit 728dbe064f95f3ac5355e23aa4468ff76c38ded5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Feb 16 20:04:40 2016 +0100 [notify] glibc: added patches for CVE-2015-7547. Advisory: https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html Thanks for the patches Fedora! diff --git a/glibc/.md5sum b/glibc/.md5sum index 12c6848..eb5c5be 100644 --- a/glibc/.md5sum +++ b/glibc/.md5sum @@ -1,9 +1,11 @@ +49019f98ab824254ebeca5aba2f22ab1 CVE-2015-7547.patch 3972ff7405c89be7f5694bdc28fbd798 CVE-2015-8776.patch c0e4a708857a0a50b9a3d1a5cc315763 CVE-2015-8777.patch 5cd75bfc0789559553b9c708c6b986ac CVE-2015-8778.patch 9623a770f7a9781272b8f30761cbe256 CVE-2015-8779.patch aaad345ff18993dafe3e44ac947f7157 glibc-2.20-multilib-dirs.patch e51e02bf552a0a1fbbdc948fb2f5e83c glibc-2.22.tar.xz +a3089fb4572929628052c4509ac85a93 glibc-rh1252570.patch 96156bec8e05de67384dc93e72bdc313 host.conf fbbc215a9b15ba4846f326cc88108057 hosts 87bb2a93d7887505a39fd65a2ee86b8e kernel-headers-4.1.tar.xz diff --git a/glibc/CVE-2015-7547.patch b/glibc/CVE-2015-7547.patch new file mode 100644 index 0000000..2a76289 --- /dev/null +++ b/glibc/CVE-2015-7547.patch @@ -0,0 +1,555 @@ +Index: b/resolv/nss_dns/dns-host.c +=================================================================== +--- a/resolv/nss_dns/dns-host.c ++++ b/resolv/nss_dns/dns-host.c +@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *an + int h_namelen = 0; + + if (ancount == 0) +- return NSS_STATUS_NOTFOUND; ++ { ++ *h_errnop = HOST_NOT_FOUND; ++ return NSS_STATUS_NOTFOUND; ++ } + + while (ancount-- > 0 && cp < end_of_message && had_error == 0) + { +@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *an + /* Special case here: if the resolver sent a result but it only + contains a CNAME while we are looking for a T_A or T_AAAA record, + we fail with NOTFOUND instead of TRYAGAIN. */ +- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; ++ if (canon != NULL) ++ { ++ *h_errnop = HOST_NOT_FOUND; ++ return NSS_STATUS_NOTFOUND; ++ } ++ ++ *h_errnop = NETDB_INTERNAL; ++ return NSS_STATUS_TRYAGAIN; + } + + +@@ -1222,11 +1232,101 @@ gaih_getanswer (const querybuf *answer1, + + enum nss_status status = NSS_STATUS_NOTFOUND; + ++ /* Combining the NSS status of two distinct queries requires some ++ compromise and attention to symmetry (A or AAAA queries can be ++ returned in any order). What follows is a breakdown of how this ++ code is expected to work and why. We discuss only SUCCESS, ++ TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns ++ that apply (though RETURN and MERGE exist). We make a distinction ++ between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable). ++ A recoverable TRYAGAIN is almost always due to buffer size issues ++ and returns ERANGE in errno and the caller is expected to retry ++ with a larger buffer. ++ ++ Lastly, you may be tempted to make significant changes to the ++ conditions in this code to bring about symmetry between responses. ++ Please don't change anything without due consideration for ++ expected application behaviour. Some of the synthesized responses ++ aren't very well thought out and sometimes appear to imply that ++ IPv4 responses are always answer 1, and IPv6 responses are always ++ answer 2, but that's not true (see the implemetnation of send_dg ++ and send_vc to see response can arrive in any order, particlarly ++ for UDP). However, we expect it holds roughly enough of the time ++ that this code works, but certainly needs to be fixed to make this ++ a more robust implementation. ++ ++ ---------------------------------------------- ++ | Answer 1 Status / | Synthesized | Reason | ++ | Answer 2 Status | Status | | ++ |--------------------------------------------| ++ | SUCCESS/SUCCESS | SUCCESS | [1] | ++ | SUCCESS/TRYAGAIN | TRYAGAIN | [5] | ++ | SUCCESS/TRYAGAIN' | SUCCESS | [1] | ++ | SUCCESS/NOTFOUND | SUCCESS | [1] | ++ | SUCCESS/UNAVAIL | SUCCESS | [1] | ++ | TRYAGAIN/SUCCESS | TRYAGAIN | [2] | ++ | TRYAGAIN/TRYAGAIN | TRYAGAIN | [2] | ++ | TRYAGAIN/TRYAGAIN' | TRYAGAIN | [2] | ++ | TRYAGAIN/NOTFOUND | TRYAGAIN | [2] | ++ | TRYAGAIN/UNAVAIL | TRYAGAIN | [2] | ++ | TRYAGAIN'/SUCCESS | SUCCESS | [3] | ++ | TRYAGAIN'/TRYAGAIN | TRYAGAIN | [3] | ++ | TRYAGAIN'/TRYAGAIN' | TRYAGAIN' | [3] | ++ | TRYAGAIN'/NOTFOUND | TRYAGAIN' | [3] | ++ | TRYAGAIN'/UNAVAIL | UNAVAIL | [3] | ++ | NOTFOUND/SUCCESS | SUCCESS | [3] | ++ | NOTFOUND/TRYAGAIN | TRYAGAIN | [3] | ++ | NOTFOUND/TRYAGAIN' | TRYAGAIN' | [3] | ++ | NOTFOUND/NOTFOUND | NOTFOUND | [3] | ++ | NOTFOUND/UNAVAIL | UNAVAIL | [3] | ++ | UNAVAIL/SUCCESS | UNAVAIL | [4] | ++ | UNAVAIL/TRYAGAIN | UNAVAIL | [4] | ++ | UNAVAIL/TRYAGAIN' | UNAVAIL | [4] | ++ | UNAVAIL/NOTFOUND | UNAVAIL | [4] | ++ | UNAVAIL/UNAVAIL | UNAVAIL | [4] | ++ ---------------------------------------------- ++ ++ [1] If the first response is a success we return success. ++ This ignores the state of the second answer and in fact ++ incorrectly sets errno and h_errno to that of the second ++ answer. However because the response is a success we ignore ++ *errnop and *h_errnop (though that means you touched errno on ++ success). We are being conservative here and returning the ++ likely IPv4 response in the first answer as a success. ++ ++ [2] If the first response is a recoverable TRYAGAIN we return ++ that instead of looking at the second response. The ++ expectation here is that we have failed to get an IPv4 response ++ and should retry both queries. ++ ++ [3] If the first response was not a SUCCESS and the second ++ response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN, ++ or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the ++ result from the second response, otherwise the first responses ++ status is used. Again we have some odd side-effects when the ++ second response is NOTFOUND because we overwrite *errnop and ++ *h_errnop that means that a first answer of NOTFOUND might see ++ its *errnop and *h_errnop values altered. Whether it matters ++ in practice that a first response NOTFOUND has the wrong ++ *errnop and *h_errnop is undecided. ++ ++ [4] If the first response is UNAVAIL we return that instead of ++ looking at the second response. The expectation here is that ++ it will have failed similarly e.g. configuration failure. ++ ++ [5] Testing this code is complicated by the fact that truncated ++ second response buffers might be returned as SUCCESS if the ++ first answer is a SUCCESS. To fix this we add symmetry to ++ TRYAGAIN with the second response. If the second response ++ is a recoverable error we now return TRYAGIN even if the first ++ response was SUCCESS. */ ++ + if (anslen1 > 0) + status = gaih_getanswer_slice(answer1, anslen1, qname, + &pat, &buffer, &buflen, + errnop, h_errnop, ttlp, + &first); ++ + if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND + || (status == NSS_STATUS_TRYAGAIN + /* We want to look at the second answer in case of an +@@ -1242,8 +1342,15 @@ gaih_getanswer (const querybuf *answer1, + &pat, &buffer, &buflen, + errnop, h_errnop, ttlp, + &first); ++ /* Use the second response status in some cases. */ + if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND) + status = status2; ++ /* Do not return a truncated second response (unless it was ++ unavoidable e.g. unrecoverable TRYAGAIN). */ ++ if (status == NSS_STATUS_SUCCESS ++ && (status2 == NSS_STATUS_TRYAGAIN ++ && *errnop == ERANGE && *h_errnop != NO_RECOVERY)) ++ status = NSS_STATUS_TRYAGAIN; + } + + return status; +Index: b/resolv/res_query.c +=================================================================== +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + } +@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + +@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + if (saved_herrno != -1) +Index: b/resolv/res_send.c +=================================================================== +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1,3 +1,20 @@ ++/* Copyright (C) 2016 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ + /* + * Copyright (c) 1985, 1989, 1993 + * The Regents of the University of California. All rights reserved. +@@ -361,6 +378,8 @@ __libc_res_nsend(res_state statp, const + #ifdef USE_HOOKS + if (__glibc_unlikely (statp->qhook || statp->rhook)) { + if (anssiz < MAXPACKET && ansp) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *buf = malloc (MAXPACKET); + if (buf == NULL) + return (-1); +@@ -660,6 +679,77 @@ libresolv_hidden_def (res_nsend) + + /* Private */ + ++/* The send_vc function is responsible for sending a DNS query over TCP ++ to the nameserver numbered NS from the res_state STATP i.e. ++ EXT(statp).nssocks[ns]. The function supports sending both IPv4 and ++ IPv6 queries at the same serially on the same socket. ++ ++ Please note that for TCP there is no way to disable sending both ++ queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP ++ and sends the queries serially and waits for the result after each ++ sent query. This implemetnation should be corrected to honour these ++ options. ++ ++ Please also note that for TCP we send both queries over the same ++ socket one after another. This technically violates best practice ++ since the server is allowed to read the first query, respond, and ++ then close the socket (to service another client). If the server ++ does this, then the remaining second query in the socket data buffer ++ will cause the server to send the client an RST which will arrive ++ asynchronously and the client's OS will likely tear down the socket ++ receive buffer resulting in a potentially short read and lost ++ response data. This will force the client to retry the query again, ++ and this process may repeat until all servers and connection resets ++ are exhausted and then the query will fail. It's not known if this ++ happens with any frequency in real DNS server implementations. This ++ implementation should be corrected to use two sockets by default for ++ parallel queries. ++ ++ The query stored in BUF of BUFLEN length is sent first followed by ++ the query stored in BUF2 of BUFLEN2 length. Queries are sent ++ serially on the same socket. ++ ++ Answers to the query are stored firstly in *ANSP up to a max of ++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP ++ is non-NULL (to indicate that modifying the answer buffer is allowed) ++ then malloc is used to allocate a new response buffer and ANSCP and ++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes ++ are needed but ANSCP is NULL, then as much of the response as ++ possible is read into the buffer, but the results will be truncated. ++ When truncation happens because of a small answer buffer the DNS ++ packets header feild TC will bet set to 1, indicating a truncated ++ message and the rest of the socket data will be read and discarded. ++ ++ Answers to the query are stored secondly in *ANSP2 up to a max of ++ *ANSSIZP2 bytes, with the actual response length stored in ++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 ++ is non-NULL (required for a second query) then malloc is used to ++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer ++ size and *ANSP2_MALLOCED is set to 1. ++ ++ The ANSP2_MALLOCED argument will eventually be removed as the ++ change in buffer pointer can be used to detect the buffer has ++ changed and that the caller should use free on the new buffer. ++ ++ Note that the answers may arrive in any order from the server and ++ therefore the first and second answer buffers may not correspond to ++ the first and second queries. ++ ++ It is not supported to call this function with a non-NULL ANSP2 ++ but a NULL ANSCP. Put another way, you can call send_vc with a ++ single unmodifiable buffer or two modifiable buffers, but no other ++ combination is supported. ++ ++ It is the caller's responsibility to free the malloc allocated ++ buffers by detecting that the pointers have changed from their ++ original values i.e. *ANSCP or *ANSP2 has changed. ++ ++ If errors are encountered then *TERRNO is set to an appropriate ++ errno value and a zero result is returned for a recoverable error, ++ and a less-than zero result is returned for a non-recoverable error. ++ ++ If no errors are encountered then *TERRNO is left unmodified and ++ a the length of the first response in bytes is returned. */ + static int + send_vc(res_state statp, + const u_char *buf, int buflen, const u_char *buf2, int buflen2, +@@ -669,11 +759,7 @@ send_vc(res_state statp, + { + const HEADER *hp = (HEADER *) buf; + const HEADER *hp2 = (HEADER *) buf2; +- u_char *ans = *ansp; +- int orig_anssizp = *anssizp; +- // XXX REMOVE +- // int anssiz = *anssizp; +- HEADER *anhp = (HEADER *) ans; ++ HEADER *anhp = (HEADER *) *ansp; + struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; + int truncating, connreset, n; + /* On some architectures compiler might emit a warning indicating +@@ -766,6 +852,8 @@ send_vc(res_state statp, + * Receive length & response + */ + int recvresp1 = 0; ++ /* Skip the second response if there is no second query. ++ To do that we mark the second response as received. */ + int recvresp2 = buf2 == NULL; + uint16_t rlen16; + read_len: +@@ -802,40 +890,14 @@ send_vc(res_state statp, + u_char **thisansp; + int *thisresplenp; + if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { ++ /* We have not received any responses ++ yet or we only have one response to ++ receive. */ + thisanssizp = anssizp; + thisansp = anscp ?: ansp; + assert (anscp != NULL || ansp2 == NULL); + thisresplenp = &resplen; + } else { +- if (*anssizp != MAXPACKET) { +- /* No buffer allocated for the first +- reply. We can try to use the rest +- of the user-provided buffer. */ +-#if __GNUC_PREREQ (4, 7) +- DIAG_PUSH_NEEDS_COMMENT; +- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); +-#endif +-#if _STRING_ARCH_unaligned +- *anssizp2 = orig_anssizp - resplen; +- *ansp2 = *ansp + resplen; +-#else +- int aligned_resplen +- = ((resplen + __alignof__ (HEADER) - 1) +- & ~(__alignof__ (HEADER) - 1)); +- *anssizp2 = orig_anssizp - aligned_resplen; +- *ansp2 = *ansp + aligned_resplen; +-#endif +-#if __GNUC_PREREQ (4, 7) +- DIAG_POP_NEEDS_COMMENT; +-#endif +- } else { +- /* The first reply did not fit into the +- user-provided buffer. Maybe the second +- answer will. */ +- *anssizp2 = orig_anssizp; +- *ansp2 = *ansp; +- } +- + thisanssizp = anssizp2; + thisansp = ansp2; + thisresplenp = resplen2; +@@ -843,10 +905,14 @@ send_vc(res_state statp, + anhp = (HEADER *) *thisansp; + + *thisresplenp = rlen; +- if (rlen > *thisanssizp) { +- /* Yes, we test ANSCP here. If we have two buffers +- both will be allocatable. */ +- if (__glibc_likely (anscp != NULL)) { ++ /* Is the answer buffer too small? */ ++ if (*thisanssizp < rlen) { ++ /* If the current buffer is non-NULL and it's not ++ pointing at the static user-supplied buffer then ++ we can reallocate it. */ ++ if (thisansp != NULL && thisansp != ansp) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *newp = malloc (MAXPACKET); + if (newp == NULL) { + *terrno = ENOMEM; +@@ -858,6 +924,9 @@ send_vc(res_state statp, + if (thisansp == ansp2) + *ansp2_malloced = 1; + anhp = (HEADER *) newp; ++ /* A uint16_t can't be larger than MAXPACKET ++ thus it's safe to allocate MAXPACKET but ++ read RLEN bytes instead. */ + len = rlen; + } else { + Dprint(statp->options & RES_DEBUG, +@@ -1021,6 +1090,66 @@ reopen (res_state statp, int *terrno, in + return 1; + } + ++/* The send_dg function is responsible for sending a DNS query over UDP ++ to the nameserver numbered NS from the res_state STATP i.e. ++ EXT(statp).nssocks[ns]. The function supports IPv4 and IPv6 queries ++ along with the ability to send the query in parallel for both stacks ++ (default) or serially (RES_SINGLKUP). It also supports serial lookup ++ with a close and reopen of the socket used to talk to the server ++ (RES_SNGLKUPREOP) to work around broken name servers. ++ ++ The query stored in BUF of BUFLEN length is sent first followed by ++ the query stored in BUF2 of BUFLEN2 length. Queries are sent ++ in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP). ++ ++ Answers to the query are stored firstly in *ANSP up to a max of ++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP ++ is non-NULL (to indicate that modifying the answer buffer is allowed) ++ then malloc is used to allocate a new response buffer and ANSCP and ++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes ++ are needed but ANSCP is NULL, then as much of the response as ++ possible is read into the buffer, but the results will be truncated. ++ When truncation happens because of a small answer buffer the DNS ++ packets header feild TC will bet set to 1, indicating a truncated ++ message, while the rest of the UDP packet is discarded. ++ ++ Answers to the query are stored secondly in *ANSP2 up to a max of ++ *ANSSIZP2 bytes, with the actual response length stored in ++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 ++ is non-NULL (required for a second query) then malloc is used to ++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer ++ size and *ANSP2_MALLOCED is set to 1. ++ ++ The ANSP2_MALLOCED argument will eventually be removed as the ++ change in buffer pointer can be used to detect the buffer has ++ changed and that the caller should use free on the new buffer. ++ ++ Note that the answers may arrive in any order from the server and ++ therefore the first and second answer buffers may not correspond to ++ the first and second queries. ++ ++ It is not supported to call this function with a non-NULL ANSP2 ++ but a NULL ANSCP. Put another way, you can call send_vc with a ++ single unmodifiable buffer or two modifiable buffers, but no other ++ combination is supported. ++ ++ It is the caller's responsibility to free the malloc allocated ++ buffers by detecting that the pointers have changed from their ++ original values i.e. *ANSCP or *ANSP2 has changed. ++ ++ If an answer is truncated because of UDP datagram DNS limits then ++ *V_CIRCUIT is set to 1 and the return value non-zero to indicate to ++ the caller to retry with TCP. The value *GOTSOMEWHERE is set to 1 ++ if any progress was made reading a response from the nameserver and ++ is used by the caller to distinguish between ECONNREFUSED and ++ ETIMEDOUT (the latter if *GOTSOMEWHERE is 1). ++ ++ If errors are encountered then *TERRNO is set to an appropriate ++ errno value and a zero result is returned for a recoverable error, ++ and a less-than zero result is returned for a non-recoverable error. ++ ++ If no errors are encountered then *TERRNO is left unmodified and ++ a the length of the first response in bytes is returned. */ + static int + send_dg(res_state statp, + const u_char *buf, int buflen, const u_char *buf2, int buflen2, +@@ -1030,8 +1159,6 @@ send_dg(res_state statp, + { + const HEADER *hp = (HEADER *) buf; + const HEADER *hp2 = (HEADER *) buf2; +- u_char *ans = *ansp; +- int orig_anssizp = *anssizp; + struct timespec now, timeout, finish; + struct pollfd pfd[1]; + int ptimeout; +@@ -1064,6 +1191,8 @@ send_dg(res_state statp, + int need_recompute = 0; + int nwritten = 0; + int recvresp1 = 0; ++ /* Skip the second response if there is no second query. ++ To do that we mark the second response as received. */ + int recvresp2 = buf2 == NULL; + pfd[0].fd = EXT(statp).nssocks[ns]; + pfd[0].events = POLLOUT; +@@ -1227,55 +1356,56 @@ send_dg(res_state statp, + int *thisresplenp; + + if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { ++ /* We have not received any responses ++ yet or we only have one response to ++ receive. */ + thisanssizp = anssizp; + thisansp = anscp ?: ansp; + assert (anscp != NULL || ansp2 == NULL); + thisresplenp = &resplen; + } else { +- if (*anssizp != MAXPACKET) { +- /* No buffer allocated for the first +- reply. We can try to use the rest +- of the user-provided buffer. */ +-#if _STRING_ARCH_unaligned +- *anssizp2 = orig_anssizp - resplen; +- *ansp2 = *ansp + resplen; +-#else +- int aligned_resplen +- = ((resplen + __alignof__ (HEADER) - 1) +- & ~(__alignof__ (HEADER) - 1)); +- *anssizp2 = orig_anssizp - aligned_resplen; +- *ansp2 = *ansp + aligned_resplen; +-#endif +- } else { +- /* The first reply did not fit into the +- user-provided buffer. Maybe the second +- answer will. */ +- *anssizp2 = orig_anssizp; +- *ansp2 = *ansp; +- } +- + thisanssizp = anssizp2; + thisansp = ansp2; + thisresplenp = resplen2; + } + + if (*thisanssizp < MAXPACKET +- /* Yes, we test ANSCP here. If we have two buffers +- both will be allocatable. */ +- && anscp ++ /* If the current buffer is non-NULL and it's not ++ pointing at the static user-supplied buffer then ++ we can reallocate it. */ ++ && (thisansp != NULL && thisansp != ansp) + #ifdef FIONREAD ++ /* Is the size too small? */ + && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0 + || *thisanssizp < *thisresplenp) + #endif + ) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *newp = malloc (MAXPACKET); + if (newp != NULL) { +- *anssizp = MAXPACKET; +- *thisansp = ans = newp; ++ *thisanssizp = MAXPACKET; ++ *thisansp = newp; + if (thisansp == ansp2) + *ansp2_malloced = 1; + } + } ++ /* We could end up with truncation if anscp was NULL ++ (not allowed to change caller's buffer) and the ++ response buffer size is too small. This isn't a ++ reliable way to detect truncation because the ioctl ++ may be an inaccurate report of the UDP message size. ++ Therefore we use this only to issue debug output. ++ To do truncation accurately with UDP we need ++ MSG_TRUNC which is only available on Linux. We ++ can abstract out the Linux-specific feature in the ++ future to detect truncation. */ ++ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) { ++ Dprint(statp->options & RES_DEBUG, ++ (stdout, ";; response may be truncated (UDP)\n") ++ ); ++ } ++ + HEADER *anhp = (HEADER *) *thisansp; + socklen_t fromlen = sizeof(struct sockaddr_in6); + assert (sizeof(from) <= fromlen); + diff --git a/glibc/Pkgfile b/glibc/Pkgfile index d1b80ba..dcdf11b 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -4,11 +4,12 @@ name=glibc version=2.22 -release=2 +release=3 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \ http://crux.nu/files/distfiles/kernel-headers-4.1.tar.xz \ $name-2.20-multilib-dirs.patch \ - CVE-2015-8779.patch CVE-2015-8778.patch CVE-2015-8777.patch CVE-2015-8776.patch \ + CVE-2015-8779.patch CVE-2015-8778.patch CVE-2015-8777.patch \ + CVE-2015-8776.patch CVE-2015-7547.patch glibc-rh1252570.patch \ hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { @@ -22,6 +23,8 @@ build() { patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8778.patch patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8777.patch patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8776.patch + patch -p1 -d $SRC/$name-$version -i $SRC/glibc-rh1252570.patch + patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-7547.patch mkdir $SRC/build cd $SRC/build diff --git a/glibc/glibc-rh1252570.patch b/glibc/glibc-rh1252570.patch new file mode 100644 index 0000000..5e69e9a --- /dev/null +++ b/glibc/glibc-rh1252570.patch @@ -0,0 +1,408 @@ +Revert this upstream commit: + +commit 2212c1420c92a33b0e0bd9a34938c9814a56c0f7 +Author: Andreas Schwab <schwab(a)suse.de> +Date: Thu Feb 19 15:52:08 2015 +0100 + + Simplify handling of nameserver configuration in resolver + + Remove use of ext.nsmap member of struct __res_state and always use + an identity mapping betwen the nsaddr_list array and the ext.nsaddrs + array. The fact that a nameserver has an IPv6 address is signalled by + setting nsaddr_list[].sin_family to zero. + +reverted: +Index: b/resolv/res_init.c +=================================================================== +--- a/resolv/res_init.c ++++ b/resolv/res_init.c +@@ -153,8 +153,10 @@ __res_vinit(res_state statp, int preinit + char *cp, **pp; + int n; + char buf[BUFSIZ]; +- int nserv = 0; /* number of nameservers read from file */ +- int have_serv6 = 0; ++ int nserv = 0; /* number of IPv4 nameservers read from file */ ++#ifdef _LIBC ++ int nservall = 0; /* number of (IPv4 + IPV6) nameservers read from file */ ++#endif + int haveenv = 0; + int havesearch = 0; + #ifdef RESOLVSORT +@@ -183,9 +185,15 @@ __res_vinit(res_state statp, int preinit + statp->_flags = 0; + statp->qhook = NULL; + statp->rhook = NULL; ++ statp->_u._ext.nsinit = 0; + statp->_u._ext.nscount = 0; +- for (n = 0; n < MAXNS; n++) +- statp->_u._ext.nsaddrs[n] = NULL; ++#ifdef _LIBC ++ statp->_u._ext.nscount6 = 0; ++ for (n = 0; n < MAXNS; n++) { ++ statp->_u._ext.nsaddrs[n] = NULL; ++ statp->_u._ext.nsmap[n] = MAXNS; ++ } ++#endif + + /* Allow user to override the local domain definition */ + if ((cp = getenv("LOCALDOMAIN")) != NULL) { +@@ -289,7 +297,11 @@ __res_vinit(res_state statp, int preinit + continue; + } + /* read nameservers to query */ ++#ifdef _LIBC ++ if (MATCH(buf, "nameserver") && nservall < MAXNS) { ++#else + if (MATCH(buf, "nameserver") && nserv < MAXNS) { ++#endif + struct in_addr a; + + cp = buf + sizeof("nameserver") - 1; +@@ -297,12 +309,13 @@ __res_vinit(res_state statp, int preinit + cp++; + if ((*cp != '\0') && (*cp != '\n') + && __inet_aton(cp, &a)) { +- statp->nsaddr_list[nserv].sin_addr = a; +- statp->nsaddr_list[nserv].sin_family = AF_INET; +- statp->nsaddr_list[nserv].sin_port = ++ statp->nsaddr_list[nservall].sin_addr = a; ++ statp->nsaddr_list[nservall].sin_family = AF_INET; ++ statp->nsaddr_list[nservall].sin_port = + htons(NAMESERVER_PORT); + nserv++; + #ifdef _LIBC ++ nservall++; + } else { + struct in6_addr a6; + char *el; +@@ -344,11 +357,10 @@ __res_vinit(res_state statp, int preinit + } + } + +- statp->nsaddr_list[nserv].sin_family = 0; +- statp->_u._ext.nsaddrs[nserv] = sa6; +- statp->_u._ext.nssocks[nserv] = -1; +- have_serv6 = 1; +- nserv++; ++ statp->_u._ext.nsaddrs[nservall] = sa6; ++ statp->_u._ext.nssocks[nservall] = -1; ++ statp->_u._ext.nsmap[nservall] = MAXNS + 1; ++ nservall++; + } + } + #endif +@@ -403,9 +415,10 @@ __res_vinit(res_state statp, int preinit + continue; + } + } +- statp->nscount = nserv; ++ statp->nscount = nservall; + #ifdef _LIBC +- if (have_serv6) { ++ if (nservall - nserv > 0) { ++ statp->_u._ext.nscount6 = nservall - nserv; + /* We try IPv6 servers again. */ + statp->ipv6_unavail = false; + } +@@ -594,7 +607,11 @@ __res_iclose(res_state statp, bool free_ + statp->_vcsock = -1; + statp->_flags &= ~(RES_F_VC | RES_F_CONN); + } ++#ifdef _LIBC ++ for (ns = 0; ns < MAXNS; ns++) ++#else + for (ns = 0; ns < statp->_u._ext.nscount; ns++) ++#endif + if (statp->_u._ext.nsaddrs[ns]) { + if (statp->_u._ext.nssocks[ns] != -1) { + close_not_cancel_no_status(statp->_u._ext.nssocks[ns]); +@@ -605,6 +622,8 @@ __res_iclose(res_state statp, bool free_ + statp->_u._ext.nsaddrs[ns] = NULL; + } + } ++ if (free_addr) ++ statp->_u._ext.nsinit = 0; + } + libc_hidden_def (__res_iclose) + +Index: b/resolv/res_send.c +=================================================================== +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -176,7 +176,6 @@ evNowTime(struct timespec *res) { + + /* Forward. */ + +-static struct sockaddr *get_nsaddr (res_state, int); + static int send_vc(res_state, const u_char *, int, + const u_char *, int, + u_char **, int *, int *, int, u_char **, +@@ -214,21 +213,20 @@ res_ourserver_p(const res_state statp, c + in_port_t port = in4p->sin_port; + in_addr_t addr = in4p->sin_addr.s_addr; + +- for (ns = 0; ns < statp->nscount; ns++) { ++ for (ns = 0; ns < MAXNS; ns++) { + const struct sockaddr_in *srv = +- (struct sockaddr_in *) get_nsaddr (statp, ns); ++ (struct sockaddr_in *)EXT(statp).nsaddrs[ns]; + +- if ((srv->sin_family == AF_INET) && ++ if ((srv != NULL) && (srv->sin_family == AF_INET) && + (srv->sin_port == port) && + (srv->sin_addr.s_addr == INADDR_ANY || + srv->sin_addr.s_addr == addr)) + return (1); + } + } else if (inp->sin6_family == AF_INET6) { +- for (ns = 0; ns < statp->nscount; ns++) { +- const struct sockaddr_in6 *srv +- = (struct sockaddr_in6 *) get_nsaddr (statp, ns); +- if ((srv->sin6_family == AF_INET6) && ++ for (ns = 0; ns < MAXNS; ns++) { ++ const struct sockaddr_in6 *srv = EXT(statp).nsaddrs[ns]; ++ if ((srv != NULL) && (srv->sin6_family == AF_INET6) && + (srv->sin6_port == inp->sin6_port) && + !(memcmp(&srv->sin6_addr, &in6addr_any, + sizeof (struct in6_addr)) && +@@ -378,48 +376,80 @@ __libc_res_nsend(res_state statp, const + * If the ns_addr_list in the resolver context has changed, then + * invalidate our cached copy and the associated timing data. + */ +- if (EXT(statp).nscount != 0) { ++ if (EXT(statp).nsinit) { + int needclose = 0; + + if (EXT(statp).nscount != statp->nscount) + needclose++; + else +- for (ns = 0; ns < statp->nscount; ns++) { +- if (statp->nsaddr_list[ns].sin_family != 0 ++ for (ns = 0; ns < MAXNS; ns++) { ++ unsigned int map = EXT(statp).nsmap[ns]; ++ if (map < MAXNS + && !sock_eq((struct sockaddr_in6 *) +- &statp->nsaddr_list[ns], ++ &statp->nsaddr_list[map], + EXT(statp).nsaddrs[ns])) + { + needclose++; + break; + } + } +- if (needclose) { ++ if (needclose) + __res_iclose(statp, false); +- EXT(statp).nscount = 0; +- } + } + + /* + * Maybe initialize our private copy of the ns_addr_list. + */ +- if (EXT(statp).nscount == 0) { +- for (ns = 0; ns < statp->nscount; ns++) { +- EXT(statp).nssocks[ns] = -1; +- if (statp->nsaddr_list[ns].sin_family == 0) +- continue; +- if (EXT(statp).nsaddrs[ns] == NULL) +- EXT(statp).nsaddrs[ns] = ++ if (EXT(statp).nsinit == 0) { ++ unsigned char map[MAXNS]; ++ ++ memset (map, MAXNS, sizeof (map)); ++ for (n = 0; n < MAXNS; n++) { ++ ns = EXT(statp).nsmap[n]; ++ if (ns < statp->nscount) ++ map[ns] = n; ++ else if (ns < MAXNS) { ++ free(EXT(statp).nsaddrs[n]); ++ EXT(statp).nsaddrs[n] = NULL; ++ EXT(statp).nsmap[n] = MAXNS; ++ } ++ } ++ n = statp->nscount; ++ if (statp->nscount > EXT(statp).nscount) ++ for (n = EXT(statp).nscount, ns = 0; ++ n < statp->nscount; n++) { ++ while (ns < MAXNS ++ && EXT(statp).nsmap[ns] != MAXNS) ++ ns++; ++ if (ns == MAXNS) ++ break; ++ /* NS never exceeds MAXNS, but gcc 4.9 somehow ++ does not see this. */ ++ DIAG_PUSH_NEEDS_COMMENT; ++ DIAG_IGNORE_NEEDS_COMMENT (4.9, ++ "-Warray-bounds"); ++ EXT(statp).nsmap[ns] = n; ++ DIAG_POP_NEEDS_COMMENT; ++ map[n] = ns++; ++ } ++ EXT(statp).nscount = n; ++ for (ns = 0; ns < EXT(statp).nscount; ns++) { ++ n = map[ns]; ++ if (EXT(statp).nsaddrs[n] == NULL) ++ EXT(statp).nsaddrs[n] = + malloc(sizeof (struct sockaddr_in6)); +- if (EXT(statp).nsaddrs[ns] != NULL) +- memset (mempcpy(EXT(statp).nsaddrs[ns], ++ if (EXT(statp).nsaddrs[n] != NULL) { ++ memset (mempcpy(EXT(statp).nsaddrs[n], + &statp->nsaddr_list[ns], + sizeof (struct sockaddr_in)), + '\0', + sizeof (struct sockaddr_in6) + - sizeof (struct sockaddr_in)); ++ EXT(statp).nssocks[n] = -1; ++ n++; ++ } + } +- EXT(statp).nscount = statp->nscount; ++ EXT(statp).nsinit = 1; + } + + /* +@@ -428,37 +458,44 @@ __libc_res_nsend(res_state statp, const + */ + if (__builtin_expect ((statp->options & RES_ROTATE) != 0, 0) && + (statp->options & RES_BLAST) == 0) { +- struct sockaddr_in ina; +- struct sockaddr_in6 *inp; +- int lastns = statp->nscount - 1; +- int fd; +- +- inp = EXT(statp).nsaddrs[0]; +- ina = statp->nsaddr_list[0]; +- fd = EXT(statp).nssocks[0]; +- for (ns = 0; ns < lastns; ns++) { +- EXT(statp).nsaddrs[ns] = EXT(statp).nsaddrs[ns + 1]; +- statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1]; +- EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1]; +- } +- EXT(statp).nsaddrs[lastns] = inp; +- statp->nsaddr_list[lastns] = ina; +- EXT(statp).nssocks[lastns] = fd; ++ struct sockaddr_in6 *ina; ++ unsigned int map; ++ ++ n = 0; ++ while (n < MAXNS && EXT(statp).nsmap[n] == MAXNS) ++ n++; ++ if (n < MAXNS) { ++ ina = EXT(statp).nsaddrs[n]; ++ map = EXT(statp).nsmap[n]; ++ for (;;) { ++ ns = n + 1; ++ while (ns < MAXNS ++ && EXT(statp).nsmap[ns] == MAXNS) ++ ns++; ++ if (ns == MAXNS) ++ break; ++ EXT(statp).nsaddrs[n] = EXT(statp).nsaddrs[ns]; ++ EXT(statp).nsmap[n] = EXT(statp).nsmap[ns]; ++ n = ns; ++ } ++ EXT(statp).nsaddrs[n] = ina; ++ EXT(statp).nsmap[n] = map; ++ } + } + + /* + * Send request, RETRY times, or until successful. + */ + for (try = 0; try < statp->retry; try++) { +- for (ns = 0; ns < statp->nscount; ns++) ++ for (ns = 0; ns < MAXNS; ns++) + { + #ifdef DEBUG + char tmpbuf[40]; + #endif +-#if defined USE_HOOKS || defined DEBUG +- struct sockaddr *nsap = get_nsaddr (statp, ns); +-#endif ++ struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; + ++ if (nsap == NULL) ++ goto next_ns; + same_ns: + #ifdef USE_HOOKS + if (__glibc_unlikely (statp->qhook != NULL)) { +@@ -615,21 +652,6 @@ libresolv_hidden_def (res_nsend) + + /* Private */ + +-static struct sockaddr * +-get_nsaddr (res_state statp, int n) +-{ +- +- if (statp->nsaddr_list[n].sin_family == 0 && EXT(statp).nsaddrs[n] != NULL) +- /* EXT(statp).nsaddrs[n] holds an address that is larger than +- struct sockaddr, and user code did not update +- statp->nsaddr_list[n]. */ +- return (struct sockaddr *) EXT(statp).nsaddrs[n]; +- else +- /* User code updated statp->nsaddr_list[n], or statp->nsaddr_list[n] +- has the same content as EXT(statp).nsaddrs[n]. */ +- return (struct sockaddr *) (void *) &statp->nsaddr_list[n]; +-} +- + static int + send_vc(res_state statp, + const u_char *buf, int buflen, const u_char *buf2, int buflen2, +@@ -644,7 +666,7 @@ send_vc(res_state statp, + // XXX REMOVE + // int anssiz = *anssizp; + HEADER *anhp = (HEADER *) ans; +- struct sockaddr *nsap = get_nsaddr (statp, ns); ++ struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; + int truncating, connreset, n; + /* On some architectures compiler might emit a warning indicating + 'resplen' may be used uninitialized. However if buf2 == NULL +@@ -677,8 +699,8 @@ send_vc(res_state statp, + + if (getpeername(statp->_vcsock, + (struct sockaddr *)&peer, &size) < 0 || +- !sock_eq(&peer, (struct sockaddr_in6 *) nsap)) { +- __res_iclose(statp, false); ++ !sock_eq(&peer, nsap)) { ++ __res_iclose(statp, false); + statp->_flags &= ~RES_F_VC; + } + } +@@ -687,19 +709,20 @@ send_vc(res_state statp, + if (statp->_vcsock >= 0) + __res_iclose(statp, false); + +- statp->_vcsock = socket(nsap->sa_family, SOCK_STREAM, 0); ++ statp->_vcsock = socket(nsap->sin6_family, SOCK_STREAM, 0); + if (statp->_vcsock < 0) { + *terrno = errno; + Perror(statp, stderr, "socket(vc)", errno); + return (-1); + } + __set_errno (0); +- if (connect(statp->_vcsock, nsap, +- nsap->sa_family == AF_INET ++ if (connect(statp->_vcsock, (struct sockaddr *)nsap, ++ nsap->sin6_family == AF_INET + ? sizeof (struct sockaddr_in) + : sizeof (struct sockaddr_in6)) < 0) { + *terrno = errno; +- Aerror(statp, stderr, "connect/vc", errno, nsap); ++ Aerror(statp, stderr, "connect/vc", errno, ++ (struct sockaddr *) nsap); + __res_iclose(statp, false); + return (0); + } +@@ -906,7 +929,8 @@ static int + reopen (res_state statp, int *terrno, int ns) + { + if (EXT(statp).nssocks[ns] == -1) { +- struct sockaddr *nsap = get_nsaddr (statp, ns); ++ struct sockaddr *nsap ++ = (struct sockaddr *) EXT(statp).nsaddrs[ns]; + socklen_t slen; + + /* only try IPv6 if IPv6 NS and if not failed before */

1 0

ports/opt (3.2): [notify] libgcrypt: update to 1.6.5
by crux＠crux.nu 15 Feb '16

15 Feb '16

commit 05c09260d55693ad3af044f60498126ffc7c49e2 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Feb 15 11:44:16 2016 +0100 [notify] libgcrypt: update to 1.6.5 Security fix for CVE-2015-7511, see http://lists.gnu.org/archive/html/info-gnu/2016-02/msg00003.html diff --git a/libgcrypt/.footprint b/libgcrypt/.footprint index 9ff569b..562d20a 100644 --- a/libgcrypt/.footprint +++ b/libgcrypt/.footprint @@ -9,12 +9,12 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libgcrypt.a -rwxr-xr-x root/root usr/lib/libgcrypt.la -lrwxrwxrwx root/root usr/lib/libgcrypt.so -> libgcrypt.so.20.0.4 -lrwxrwxrwx root/root usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.0.4 --rwxr-xr-x root/root usr/lib/libgcrypt.so.20.0.4 -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/hmac256.1.gz +lrwxrwxrwx root/root usr/lib/libgcrypt.so -> libgcrypt.so.20.0.5 +lrwxrwxrwx root/root usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.0.5 +-rwxr-xr-x root/root usr/lib/libgcrypt.so.20.0.5 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/libgcrypt.m4 +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/hmac256.1.gz diff --git a/libgcrypt/.md5sum b/libgcrypt/.md5sum index f82610b..653bac4 100644 --- a/libgcrypt/.md5sum +++ b/libgcrypt/.md5sum @@ -1 +1 @@ -4c13c5fa43147866f993d73ee62af176 libgcrypt-1.6.4.tar.bz2 +3babc8af8978eeafa1bdbfef066ea943 libgcrypt-1.6.5.tar.bz2 diff --git a/libgcrypt/Pkgfile b/libgcrypt/Pkgfile index ab61c31..d612e8d 100644 --- a/libgcrypt/Pkgfile +++ b/libgcrypt/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libgpg-error name=libgcrypt -version=1.6.4 +version=1.6.5 release=1 source=(ftp://ftp.gnupg.org/gcrypt/libgcrypt/$name-$version.tar.bz2) @@ -15,7 +15,6 @@ build() { ./configure \ --prefix=/usr \ --disable-padlock-support \ - --mandir=/usr/man \ --enable-static=yes make make DESTDIR=$PKG install

1 0

ports/opt (3.2): [notify] firefox: updated to 44.0.2. Fix for CVE-2016-1949
by crux＠crux.nu 11 Feb '16

11 Feb '16

commit 6de1eefe780de06ac852072ee9b8941c955160f7 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Thu Feb 11 20:09:24 2016 +0100 [notify] firefox: updated to 44.0.2. Fix for CVE-2016-1949 https://www.mozilla.org/en-US/security/advisories/mfsa2016-13/ diff --git a/firefox/.md5sum b/firefox/.md5sum index 5d799dd..63ffc8b 100644 --- a/firefox/.md5sum +++ b/firefox/.md5sum @@ -1,3 +1,3 @@ -66d4810df0b5a6095e2276256bf17675 firefox-44.0.1.source.tar.xz +9596accec2ce7031eaab5c33373a1af4 firefox-44.0.2.source.tar.xz 1c53b819f800c61cd50e7c47bdb30bf0 firefox-install-dir.patch cf6971669f70b440cb6ff8df8b2722ae firefox.desktop diff --git a/firefox/Pkgfile b/firefox/Pkgfile index c581657..6a25d5c 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -4,7 +4,7 @@ # Depends on: nss, unzip, zip, libidl, gtk, gtk3, python, alsa-lib, xorg-libxt, yasm, mesa3d name=firefox -version=44.0.1 +version=44.0.2 release=1 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox… firefox-install-dir.patch firefox.desktop)

2 1

ports/opt (3.2): [notify] flash-player-plugin: updated to 11.2.202.569
by crux＠crux.nu 10 Feb '16

10 Feb '16

commit ec48ff76939f3db0cbd062bb6c335bafb1db6fbc Author: Jose V Beneyto <sepen(a)crux.nu> Date: Wed Feb 10 00:07:35 2016 +0000 [notify] flash-player-plugin: updated to 11.2.202.569 Security update: https://helpx.adobe.com/security/products/flash-player/apsb16-04.html diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum index 8203a56..67a9c86 100644 --- a/flash-player-plugin/.md5sum +++ b/flash-player-plugin/.md5sum @@ -1 +1 @@ -b20fe5056f58ba95c7a3f19e7e9343a2 flash-plugin-11.2.202.559-release.x86_64.rpm +dc80d6f945137d39387af6bc5c5484eb flash-plugin-11.2.202.569-release.x86_64.rpm diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index 0a4ecfb..0b8dd0c 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=flash-player-plugin -version=11.2.202.559 +version=11.2.202.569 release=1 source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash…

1 0

ports/opt (3.2): [notify] php: update to 5.6.18
by crux＠crux.nu 08 Feb '16

08 Feb '16

commit 16546f841d54676967137d82d17fa1343dc24360 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Feb 8 17:41:14 2016 +0100 [notify] php: update to 5.6.18 Includes security fixes, see http://php.net/ChangeLog-5.php#5.6.18 diff --git a/php/.md5sum b/php/.md5sum index 91d9d07..094cd0d 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -5e080e4b7df5db24f1b64313f8114bd8 php-5.6.17.tar.xz +177ba962557795866ae331ad4ad99bba php-5.6.18.tar.xz diff --git a/php/Pkgfile b/php/Pkgfile index f21e022..ad535cb 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.6.17 +version=5.6.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0

ports/opt (3.2): [notify] jre: security update to 1.8.0_74
by crux＠crux.nu 07 Feb '16

07 Feb '16

commit 87b317d1bdc0c9225d637848717dabf644fb65ed Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 7 17:55:00 2016 +0100 [notify] jre: security update to 1.8.0_74 diff --git a/jre/.md5sum b/jre/.md5sum index b41972e..6acc54b 100644 --- a/jre/.md5sum +++ b/jre/.md5sum @@ -1 +1 @@ -f45932f9a3a9c38e47a60504d21449f8 jre-8u72-linux-x64.tar.gz +60b85f47a0456a01c970b2298adb925a jre-8u74-linux-x64.tar.gz diff --git a/jre/Pkgfile b/jre/Pkgfile index 0e7189b..e0f44fb 100644 --- a/jre/Pkgfile +++ b/jre/Pkgfile @@ -4,7 +4,7 @@ # Packager: Simone Rota, sip at crux dot nu name=jre -version=1.8.0_72 +version=1.8.0_74 release=1 source=(file:///$name-8u${version#*_}-linux-x64.tar.gz)

1 0