Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b4e8a7ddf19a3b858212433ed766f0a1bdb5656)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b4e8a7ddf19a3b858212433ed766f0a1bdb5656)
  • Date: Wed, 3 Dec 2014 23:56:51 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
ftp/wget/DEPENDS | 5 +
ftp/wget/HISTORY | 3
libs/glibc/DETAILS | 10 +-
libs/glibc/HISTORY | 14 ++
libs/glibc/PRE_BUILD | 8 -
net/minidlna/DETAILS | 2
net/minidlna/HISTORY | 3
net/minidlna/minidlna-1.1.4.tar.gz.sig |binary
video/ffmpeg/DEPENDS | 2
video/ffmpeg/HISTORY | 8 +
x11-libs/wine/CONFIGURE | 3
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 6 +
x11-libs/wine/PRE_BUILD | 7 -
x11-libs/wine/sc2-login.diff | 160
---------------------------------
16 files changed, 42 insertions(+), 191 deletions(-)

New commits:
commit 1b4e8a7ddf19a3b858212433ed766f0a1bdb5656
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Cleanup HISTORY formatting

commit 91c09394a943a078a390fb67e48c4da169cd7d43
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Updated kernel headers to 3.17.4
The prior 2.6.38 headers are getting too old (e.g. libcap requires newer,
see https://bugs.launchpad.net/ubuntu/+source/libcap-ng/+bug/684969)
* PRE_BUILD: Remove 2.6.x kernel code for non-sanitized headers

commit a4c549f85b01894386f15172bd2546e17527e385
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated 1.7.32 (devel)
* PREPARE, sc2-login.diff: Removed, no longer applies cleanly and fails
to compile when cleaned up.
* CONFIGURE: Remove WINE_SC2_LOGIN persistent variable

commit 77007ea6e2f636cbcdf5b58a7e0ec8736b946abc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

minidlna: Updated to 1.1.4

commit a49d5ac7cfbd5948950de2d2088212db80e10884
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ffmpeg: Fix HISTORY formatting

commit 3100cd9afea1239ab38a09f9bedb1f6683b5a3a3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ffmpeg: SSL flag is --enable-openssl not --enable-SSL

commit 9b2d2dfb54fee7308bc779aed3974f705d52c258
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

nettle: Optionally depends on nettle for NTLM authentication

diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index c024043..ae541e4 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -17,6 +17,11 @@ optional_depends "texinfo" \
"" \
"to build info files" &&

+optional_depends "nettle" \
+ '--enable-ntlm' \
+ '--disable-ntlm' \
+ 'for NTLM authentication' &&
+
case $WGET_SSL in
none)
;;
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index a0710ca..5c4232b 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,6 @@
+2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on nettle for NTLM authentication
+
2014-10-31 Vlad Glagolev <stealth AT sourcemage.org>
* REPAIR^all^PRE_SUB_DEPENDS: more properly migrate from openssl to
SSL
provider
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index d234750..ddda20e 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -41,13 +41,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
PATCHLEVEL=1
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.38
- SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
- SOURCE6=${SOURCE3}.sign
+ HEADERS_VERSION=3.17.4
+ SOURCE3=linux-${HEADERS_VERSION}.tar.xz
+ SOURCE6=linux-${HEADERS_VERSION}.tar.sign
SOURCE6_IGNORE=signature
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE3_URL[0]="$KERNEL_URL/pub/linux/kernel/v2.6/$SOURCE3"
- SOURCE6_URL[0]="${SOURCE3_URL[0]}.sign"
+ SOURCE3_URL[0]="$KERNEL_URL/pub/linux/kernel/v3.x/$SOURCE3"
+ SOURCE6_URL[0]="$KERNEL_URL/pub/linux/kernel/v3.x/$SOURCE6"
else
local LINUX_DIRECTORY
LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index dd1a6f9..74bb8a8 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated kernel headers to 3.17.4
+ The prior 2.6.38 headers are getting too old (e.g. libcap requires
newer,
+ see https://bugs.launchpad.net/ubuntu/+source/libcap-ng/+bug/684969)
+ * PRE_BUILD: Remove 2.6.x kernel code for non-sanitized headers
+
2014-11-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: allow drop of strip option if a user desires so
@@ -9,7 +15,7 @@
2014-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, glibc-2.19-fix-sign-in-bsloww1-input.patch,
glibc-2.19-xattr_header.patch: add bug fixes from arch linux
- * PRE_BUILD,
+ * PRE_BUILD,
00_all_0005-reload-etc-resolv.conf-when-it-has-changed.patch,
00_all_0007-rtld-do-not-ignore-arch-specific-CFLAGS.patch,
00_all_0008-nptl-handle-EAGAIN-with-some-futex-operations.patch,
@@ -50,7 +56,7 @@
Added patch to fix res_query assertion and another to fix various
hangs
* fix-res_query-assert.patch: added, fix assertion in res_query
* revert-c5a0802a.patch: added, revert to fix various hangs
- * removed unused files
+ * removed unused files

2012-07-10 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: apply as_fn_executable_p.patch
@@ -76,14 +82,14 @@
* DETAILS: PATCHLEVEL=2
* DEPENDS: added runtime_depends tzdata
* PRE_BUILD: apply patches to not install time zone rules
- remove localtime.patch
+ remove localtime.patch
* do_not_install_timezones.patch, do_not_install_timezones_2.patch:
from upstream. Do not install timezones, instead use tzdata.
The timezone rules included with glibc are fairly dated.
* localtime.patch: removed, no longer needed

2012-05-15 Sukneet Basuta <sukneet AT sourcemage.org>
- * DETAILS: fix SOURCE URLS for sigs of kernel versions >=3.0
+ * DETAILS: fix SOURCE URLS for sigs of kernel versions >=3.0
* PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1
and patches >3.0.4

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 96ab47f..e4df450 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -30,13 +30,6 @@ if [ "$GLIBC_NPTL" = "y" ]; then
unpack_file 3 || return 1
;;
esac
- if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- cd $GLIBC_HEADERS_DIR &&
- if [ ! -z $SOURCE3 ]; then
- bzcat ${SOURCE_CACHE}/$SOURCE3 > ${SOURCE3%.bz2}
- fi &&
- make mrproper
- else
cd $GLIBC_HEADERS_DIR &&
if [ ! -z $SOURCE7 ]; then
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
@@ -61,7 +54,6 @@ if [ "$GLIBC_NPTL" = "y" ]; then
fi
fi &&
make mrproper
- fi
else
cd $SOURCE_DIRECTORY &&
#
diff --git a/net/minidlna/DETAILS b/net/minidlna/DETAILS
index d76f2e3..375d09d 100755
--- a/net/minidlna/DETAILS
+++ b/net/minidlna/DETAILS
@@ -1,5 +1,5 @@
SPELL=minidlna
- VERSION=1.1.2
+ VERSION=1.1.4
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
#
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index ed88cfe..1102860 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.4
+
2014-05-05 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.2

diff --git a/net/minidlna/minidlna-1.1.2.tar.gz.sig
b/net/minidlna/minidlna-1.1.2.tar.gz.sig
deleted file mode 100644
index b79fc65..0000000
Binary files a/net/minidlna/minidlna-1.1.2.tar.gz.sig and /dev/null differ
diff --git a/net/minidlna/minidlna-1.1.4.tar.gz.sig
b/net/minidlna/minidlna-1.1.4.tar.gz.sig
new file mode 100644
index 0000000..fae70f4
Binary files /dev/null and b/net/minidlna/minidlna-1.1.4.tar.gz.sig differ
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 41216c7..ae90bb8 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -27,7 +27,7 @@ optional_depends frei0r-plugins \

if [[ $FFMPEG_RELEASE == stable ]]; then
optional_depends SSL \
- "--enable-SSL" \
+ "--enable-openssl" \
"" \
"for crypto support via OpenSSL
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR})" &&

diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 6600112..95d72a9 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,7 +1,9 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: SSL flag is --enable-openssl not --enable-SSL

- * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL

2014-08-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.2
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
index a7a0d4d..48a11d7 100755
--- a/x11-libs/wine/CONFIGURE
+++ b/x11-libs/wine/CONFIGURE
@@ -7,4 +7,5 @@ if [[ "${ARCH}" = 'x86_64' ]]; then
config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64' ''
fi &&

-config_query WINE_SC2_LOGIN "Apply StarCraft II patches?" n
+# Remove on 2015-02-03
+persistent_remove WINE_SC2_LOGIN
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index cca72c5..a5202d5 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.7.30
+ VERSION=1.7.32
else
VERSION=1.6.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 432eee0..45d6b2f 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2014-12-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated 1.7.32 (devel)
+ * PREPARE, sc2-login.diff: Removed, no longer applies cleanly and
fails to
+ compile when cleaned up.
+ * CONFIGURE: Remove WINE_SC2_LOGIN persistent variable
+
2014-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.30 (devel)

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
deleted file mode 100755
index fe47929..0000000
--- a/x11-libs/wine/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-
-if [[ "$WINE_SC2_LOGIN" == "y" ]]; then
- message "${MESSAGE_COLOR}Applying StarCraft II login bug
patch...${DEFAULT_COLOR}" &&
- cd $SOURCE_DIRECTORY &&
- patch -p1 < $SPELL_DIRECTORY/sc2-login.diff
-fi
diff --git a/x11-libs/wine/sc2-login.diff b/x11-libs/wine/sc2-login.diff
deleted file mode 100644
index 7a42b6e..0000000
--- a/x11-libs/wine/sc2-login.diff
+++ /dev/null
@@ -1,160 +0,0 @@
-# http://appdb.winehq.org/objectManager.php?sClass=version&iId=19376
-# http://www.winehq.org/pipermail/wine-patches/2010-March/085817.html
-diff -Naur wine-1.6.orig/dlls/kernel32/tests/debugger.c
wine-1.6/dlls/kernel32/tests/debugger.c
---- wine-1.6.orig/dlls/kernel32/tests/debugger.c 2013-07-18
10:57:36.000000000 -0700
-+++ wine-1.6/dlls/kernel32/tests/debugger.c 2013-07-24 11:46:32.712785675
-0700
-@@ -605,8 +605,10 @@
- static void test_debug_loop(int argc, char **argv)
- {
- const char *arguments = " debugger child ";
-+ IMAGE_DATA_DIRECTORY import_dir = {0};
- struct child_blackbox blackbox;
- char blackbox_file[MAX_PATH];
-+ const char *base = NULL;
- PROCESS_INFORMATION pi;
- STARTUPINFOA si;
- BOOL debug;
-@@ -647,13 +649,107 @@
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n",
GetLastError());
- if (!ret) break;
-
-- if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
-+ switch (ev.dwDebugEventCode)
-+ {
-+ case CREATE_PROCESS_DEBUG_EVENT:
-+ {
-+ IMAGE_THUNK_DATA *imports, *thunks;
-+ IMAGE_IMPORT_DESCRIPTOR *desc;
-+ IMAGE_DOS_HEADER dos;
-+ IMAGE_NT_HEADERS nt;
-+ unsigned int i, j;
-+ char *data;
-+
-+ base = ev.u.CreateProcessInfo.lpBaseOfImage;
-+
-+ ret = ReadProcessMemory(pi.hProcess, base, &dos,
sizeof(dos), NULL);
-+ ok(ret, "ReadProcessMemory failed, last error %#x.\n",
GetLastError());
-+ ok(dos.e_magic == IMAGE_DOS_SIGNATURE, "Wrong DOS signature
%#x.\n", dos.e_magic);
-+
-+ ret = ReadProcessMemory(pi.hProcess, base + dos.e_lfanew,
&nt, sizeof(nt), NULL);
-+ ok(ret, "ReadProcessMemory failed, last error %#x.\n",
GetLastError());
-+ ok(nt.Signature == IMAGE_NT_SIGNATURE, "Wrong NT signature
%#x.\n", nt.Signature);
-+
-+ import_dir =
nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT];
-+
-+ data = HeapAlloc(GetProcessHeap(), 0, import_dir.Size);
-+ ret = ReadProcessMemory(pi.hProcess, base +
import_dir.VirtualAddress, data, import_dir.Size, NULL);
-+ ok(ret, "ReadProcessMemory failed, last error %#x.\n",
GetLastError());
-+ desc = (IMAGE_IMPORT_DESCRIPTOR *)data;
-+
-+ i = 0;
-+ while (desc[i].Name && desc[i].FirstThunk)
-+ {
-+ thunks = (IMAGE_THUNK_DATA *)(data +
(desc[i].FirstThunk - import_dir.VirtualAddress));
-+ imports = (IMAGE_THUNK_DATA *)(data +
(U(desc[i]).OriginalFirstThunk - import_dir.VirtualAddress));
-+
-+ j = 0;
-+ while (imports[j].u1.Ordinal)
-+ {
-+ ok(!thunks[j].u1.Function || thunks[j].u1.Function
== imports[j].u1.Function,
-+ "desc %u, import %u is already resolved,
%#x -> %#x.\n",
-+ i, j, imports[j].u1.Function,
thunks[j].u1.Function);
-+ ++j;
-+ }
-+ ++i;
-+ }
-+
-+ HeapFree(GetProcessHeap(), 0, data);
-+ break;
-+ }
-+
-+ case EXCEPTION_DEBUG_EVENT:
-+ {
-+ IMAGE_THUNK_DATA *imports, *thunks;
-+ IMAGE_IMPORT_DESCRIPTOR *desc;
-+ unsigned int i, j;
-+ char *data;
-+
-+ if (ev.u.Exception.ExceptionRecord.ExceptionCode !=
EXCEPTION_BREAKPOINT)
-+ {
-+ ok(0, "Received unexpected exception %#x.\n",
ev.u.Exception.ExceptionRecord.ExceptionCode);
-+ break;
-+ }
-+
-+ data = HeapAlloc(GetProcessHeap(), 0, import_dir.Size);
-+ ret = ReadProcessMemory(pi.hProcess, base +
import_dir.VirtualAddress, data, import_dir.Size, NULL);
-+ ok(ret, "ReadProcessMemory failed, last error %#x.\n",
GetLastError());
-+ desc = (IMAGE_IMPORT_DESCRIPTOR *)data;
-+
-+ i = 0;
-+ while (desc[i].Name && desc[i].FirstThunk)
-+ {
-+ thunks = (IMAGE_THUNK_DATA *)(data +
(desc[i].FirstThunk - import_dir.VirtualAddress));
-+ imports = (IMAGE_THUNK_DATA *)(data +
(U(desc[i]).OriginalFirstThunk - import_dir.VirtualAddress));
-+
-+ j = 0;
-+ while (imports[j].u1.Ordinal)
-+ {
-+ ok(thunks[j].u1.Function && thunks[j].u1.Function
!= imports[j].u1.Function,
-+ "desc %u, import %u isn't resolved yet, %#x
-> %#x.\n",
-+ i, j, imports[j].u1.Function,
thunks[j].u1.Function);
-+ ++j;
-+ }
-+ ++i;
-+ }
-+
-+ HeapFree(GetProcessHeap(), 0, data);
-+ break;
-+ }
-+
-+ case EXIT_PROCESS_DEBUG_EVENT:
-+ goto done;
-+
-+ default:
-+ break;
-+ }
-
- ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId,
DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n",
GetLastError());
- if (!ret) break;
- }
-
-+done:
- ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
- ret = CloseHandle(pi.hProcess);
-diff -Naur wine-1.6.orig/dlls/ntdll/loader.c wine-1.6/dlls/ntdll/loader.c
---- wine-1.6.orig/dlls/ntdll/loader.c 2013-07-18 10:57:36.000000000 -0700
-+++ wine-1.6/dlls/ntdll/loader.c 2013-07-24 11:46:32.713785683 -0700
-@@ -2612,10 +2612,14 @@
- */
- static NTSTATUS attach_process_dlls( void *wm )
- {
-+ LPCWSTR load_path;
- NTSTATUS status;
-
- pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL );
-
-+ load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
-+ if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) return
status;
-+
- RtlEnterCriticalSection( &loader_section );
- if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS)
- {
-@@ -2701,7 +2705,6 @@
- static const WCHAR globalflagW[] =
{'G','l','o','b','a','l','F','l','a','g',0};
- NTSTATUS status;
- WINE_MODREF *wm;
-- LPCWSTR load_path;
- PEB *peb = NtCurrentTeb()->Peb;
-
- if (main_exe_file) NtClose( main_exe_file ); /* at this point the main
module is created */
-@@ -2733,8 +2736,6 @@
- if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error;
-
- actctx_init();
-- load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
-- if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto
error;
- if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error;
- if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error;
- heap_set_debug_flags( GetProcessHeap() );



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b4e8a7ddf19a3b858212433ed766f0a1bdb5656), Eric Sandall, 12/04/2014

Archive powered by MHonArc 2.6.24.

Top of Page