July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit mozilla-nspr for openSUSE:12.2
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:12.2 checked in at 2012-07-25 10:35:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/mozilla-nspr (Old) and /work/SRC/openSUSE:12.2/.mozilla-nspr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/mozilla-nspr/mozilla-nspr.changes 2012-06-25 15:46:28.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.mozilla-nspr.new/mozilla-nspr.changes 2012-07-25 10:35:41.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 24 08:49:25 UTC 2012 - wr(a)rosenauer.org + +- update to version 4.9.2 + * new PR_SetThreadName and PR_GetThreadName functions for setting + and getting the name of the *current thread* + +------------------------------------------------------------------- Old: ---- nspr-4.9.1.tar.bz2 New: ---- nspr-4.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.07BuOZ/_old 2012-07-25 10:35:42.000000000 +0200 +++ /var/tmp/diff_new_pack.07BuOZ/_new 2012-07-25 10:35:42.000000000 +0200 @@ -18,7 +18,7 @@ Name: mozilla-nspr -Version: 4.9.1 +Version: 4.9.2 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 ++++++ nspr-4.9.1.tar.bz2 -> nspr-4.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/admin/repackage.sh new/nspr-4.9.2/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.9.1/mozilla/nsprpub/admin/repackage.sh 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/admin/repackage.sh 2012-07-24 10:48:27.000000000 +0200 @@ -32,10 +32,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.9.1 -TOTOP=./v4.9.1 -NSPRDIR=nspr-4.9.1 -SOURCETAG=NSPR_4_9_1_RTM +FROMTOP=/share/builds/components/nspr20/v4.9.2 +TOTOP=./v4.9.2 +NSPRDIR=nspr-4.9.2 +SOURCETAG=NSPR_4_9_2_RTM # # enumerate Unix object directories on /s/b/c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/config/prdepend.h new/nspr-4.9.2/mozilla/nsprpub/config/prdepend.h --- old/nspr-4.9.1/mozilla/nsprpub/config/prdepend.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/config/prdepend.h 2012-07-24 10:48:27.000000000 +0200 @@ -10,4 +10,3 @@ */ #error "Do not include this header file." - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/configure new/nspr-4.9.2/mozilla/nsprpub/configure --- old/nspr-4.9.1/mozilla/nsprpub/configure 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/configure 2012-07-24 10:48:27.000000000 +0200 @@ -736,7 +736,7 @@ MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=1 +MOD_PATCH_VERSION=2 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/configure.in new/nspr-4.9.2/mozilla/nsprpub/configure.in --- old/nspr-4.9.1/mozilla/nsprpub/configure.in 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/configure.in 2012-07-24 10:48:27.000000000 +0200 @@ -15,7 +15,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=1 +MOD_PATCH_VERSION=2 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_win95.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_win95.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_win95.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_win95.h 2012-07-24 10:48:28.000000000 +0200 @@ -362,6 +362,7 @@ #define _MD_CREATE_THREAD _PR_MD_CREATE_THREAD #define _MD_YIELD _PR_MD_YIELD #define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY +#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME #define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD #define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK #define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_winnt.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_winnt.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_winnt.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_winnt.h 2012-07-24 10:48:28.000000000 +0200 @@ -376,6 +376,7 @@ #define _MD_END_THREAD _PR_MD_END_THREAD #define _MD_YIELD _PR_MD_YIELD #define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY +#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME #define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD #define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK #define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/prinit.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/prinit.h 2012-07-24 10:48:28.000000000 +0200 @@ -31,10 +31,10 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.9.1" +#define PR_VERSION "4.9.2" #define PR_VMAJOR 4 #define PR_VMINOR 9 -#define PR_VPATCH 1 +#define PR_VPATCH 2 #define PR_BETA PR_FALSE /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/private/primpl.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/private/primpl.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/private/primpl.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/private/primpl.h 2012-07-24 10:48:28.000000000 +0200 @@ -977,6 +977,9 @@ extern void _PR_MD_SET_PRIORITY(_MDThread *md, PRThreadPriority newPri); #define _PR_MD_SET_PRIORITY _MD_SET_PRIORITY +extern void _PR_MD_SET_CURRENT_THREAD_NAME(const char *name); +#define _PR_MD_SET_CURRENT_THREAD_NAME _MD_SET_CURRENT_THREAD_NAME + NSPR_API(void) _PR_MD_SUSPENDALL(void); #define _PR_MD_SUSPENDALL _MD_SUSPENDALL @@ -1533,6 +1536,7 @@ PRIntn errorStringLength; /* textLength from last call to PR_SetErrorText() */ PRInt32 errorStringSize; /* malloc()'d size of buffer | zero */ char *errorString; /* current error string | NULL */ + char *name; /* thread's name */ #if defined(_PR_PTHREADS) pthread_t id; /* pthread identifier for the thread */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/prthread.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/prthread.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/prthread.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/prthread.h 2012-07-24 10:48:28.000000000 +0200 @@ -145,6 +145,17 @@ NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority); /* +** Set the name of the current thread, which will be visible in a debugger +** and accessible via a call to PR_GetThreadName(). +*/ +NSPR_API(PRStatus) PR_SetCurrentThreadName(const char *name); + +/* +** Return the name of "thread", if set. Otherwise return NULL. +*/ +NSPR_API(const char *) PR_GetThreadName(const PRThread *thread); + +/* ** This routine returns a new index for per-thread-private data table. ** The index is visible to all threads within a process. This index can ** be used with the PR_SetThreadPrivate() and PR_GetThreadPrivate() routines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/ntthread.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/ntthread.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/ntthread.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/ntthread.c 2012-07-24 10:48:28.000000000 +0200 @@ -276,6 +276,42 @@ return; } +const DWORD MS_VC_EXCEPTION = 0x406D1388; + +#pragma pack(push,8) +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; // Must be 0x1000. + LPCSTR szName; // Pointer to name (in user addr space). + DWORD dwThreadID; // Thread ID (-1=caller thread). + DWORD dwFlags; // Reserved for future use, must be zero. +} THREADNAME_INFO; +#pragma pack(pop) + +void +_PR_MD_SET_CURRENT_THREAD_NAME(const char *name) +{ +#ifdef _MSC_VER + THREADNAME_INFO info; + + if (!IsDebuggerPresent()) + return; + + info.dwType = 0x1000; + info.szName = (char*) name; + info.dwThreadID = -1; + info.dwFlags = 0; + + __try { + RaiseException(MS_VC_EXCEPTION, + 0, + sizeof(info) / sizeof(ULONG_PTR), + (ULONG_PTR*)&info); + } __except(EXCEPTION_CONTINUE_EXECUTION) { + } +#endif +} + void _PR_MD_CLEAN_THREAD(PRThread *thread) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/w95thred.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/w95thred.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/w95thred.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/w95thred.c 2012-07-24 10:48:28.000000000 +0200 @@ -168,6 +168,42 @@ return; } +const DWORD MS_VC_EXCEPTION = 0x406D1388; + +#pragma pack(push,8) +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; // Must be 0x1000. + LPCSTR szName; // Pointer to name (in user addr space). + DWORD dwThreadID; // Thread ID (-1=caller thread). + DWORD dwFlags; // Reserved for future use, must be zero. +} THREADNAME_INFO; +#pragma pack(pop) + +void +_PR_MD_SET_CURRENT_THREAD_NAME(const char *name) +{ +#ifdef _MSC_VER + THREADNAME_INFO info; + + if (!IsDebuggerPresent()) + return; + + info.dwType = 0x1000; + info.szName = (char*) name; + info.dwThreadID = -1; + info.dwFlags = 0; + + __try { + RaiseException(MS_VC_EXCEPTION, + 0, + sizeof(info) / sizeof(ULONG_PTR), + (ULONG_PTR*)&info); + } __except(EXCEPTION_CONTINUE_EXECUTION) { + } +#endif +} + void _PR_MD_CLEAN_THREAD(PRThread *thread) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/nspr.def new/nspr-4.9.2/mozilla/nsprpub/pr/src/nspr.def --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/nspr.def 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/nspr.def 2012-07-24 10:48:28.000000000 +0200 @@ -446,3 +446,8 @@ ;+ global: PR_GetVersion; ;+} NSPR_4.8; +;+NSPR_4.9.2 { +;+ global: + PR_GetThreadName; + PR_SetCurrentThreadName; +;+} NSPR_4.8.9; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/pthreads/ptthread.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/pthreads/ptthread.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-07-24 10:48:28.000000000 +0200 @@ -19,6 +19,7 @@ #include <unistd.h> #include <string.h> #include <signal.h> +#include <dlfcn.h> #ifdef SYMBIAN /* In Open C sched_get_priority_min/max do not work properly, so we undefine @@ -794,6 +795,8 @@ PR_Free(thred->privateData); if (NULL != thred->errorString) PR_Free(thred->errorString); + if (NULL != thred->name) + PR_Free(thred->name); PR_Free(thred->stack); if (NULL != thred->syspoll_list) PR_Free(thred->syspoll_list); @@ -1612,6 +1615,88 @@ #endif /* !defined(_PR_DCETHREADS) */ +PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name) +{ + PRThread *thread; + size_t nameLen; + int result; + + if (!name) { + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + + thread = PR_GetCurrentThread(); + if (!thread) + return PR_FAILURE; + + PR_Free(thread->name); + nameLen = strlen(name); + thread->name = (char *)PR_Malloc(nameLen + 1); + if (!thread->name) + return PR_FAILURE; + memcpy(thread->name, name, nameLen + 1); + +#if defined(OPENBSD) || defined(FREEBSD) + result = pthread_set_name_np(thread->id, name); +#else /* not BSD */ + /* + * On OSX, pthread_setname_np is only available in 10.6 or later, so test + * for it at runtime. It also may not be available on all linux distros. + */ +#if defined(DARWIN) + int (*dynamic_pthread_setname_np)(const char*); +#else + int (*dynamic_pthread_setname_np)(pthread_t, const char*); +#endif + + *(void**)(&dynamic_pthread_setname_np) = + dlsym(RTLD_DEFAULT, "pthread_setname_np"); + if (!dynamic_pthread_setname_np) + return PR_SUCCESS; + + /* + * The 15-character name length limit is an experimentally determined + * length of a null-terminated string that most linux distros and OS X + * accept as an argument to pthread_setname_np. Otherwise the E2BIG + * error is returned by the function. + */ +#define SETNAME_LENGTH_CONSTRAINT 15 +#define SETNAME_FRAGMENT1_LENGTH (SETNAME_LENGTH_CONSTRAINT >> 1) +#define SETNAME_FRAGMENT2_LENGTH \ + (SETNAME_LENGTH_CONSTRAINT - SETNAME_FRAGMENT1_LENGTH - 1) + char name_dup[SETNAME_LENGTH_CONSTRAINT + 1]; + if (nameLen > SETNAME_LENGTH_CONSTRAINT) { + memcpy(name_dup, name, SETNAME_FRAGMENT1_LENGTH); + name_dup[SETNAME_FRAGMENT1_LENGTH] = '~'; + /* Note that this also copies the null terminator. */ + memcpy(name_dup + SETNAME_FRAGMENT1_LENGTH + 1, + name + nameLen - SETNAME_FRAGMENT2_LENGTH, + SETNAME_FRAGMENT2_LENGTH + 1); + name = name_dup; + } + +#if defined(DARWIN) + result = dynamic_pthread_setname_np(name); +#else + result = dynamic_pthread_setname_np(thread->id, name); +#endif +#endif /* not BSD */ + + if (result) { + PR_SetError(PR_UNKNOWN_ERROR, result); + return PR_FAILURE; + } + return PR_SUCCESS; +} + +PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread) +{ + if (!thread) + return NULL; + return thread->name; +} + #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */ /* ptthread.c */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/combined/pruthr.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/combined/pruthr.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/combined/pruthr.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/combined/pruthr.c 2012-07-24 10:48:28.000000000 +0200 @@ -237,6 +237,7 @@ PR_ASSERT(thread->dumpArg == 0 && thread->dump == 0); PR_ASSERT(thread->errorString == 0 && thread->errorStringSize == 0); PR_ASSERT(thread->errorStringLength == 0); + PR_ASSERT(thread->name == 0); /* Reset data members in thread structure */ thread->errorCode = thread->osErrorCode = 0; @@ -1581,6 +1582,37 @@ } else _PR_SetThreadPriority(thread, newPri); } +PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name) +{ + PRThread *thread; + size_t nameLen; + + if (!name) { + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + + thread = PR_GetCurrentThread(); + if (!thread) + return PR_FAILURE; + + PR_Free(thread->name); + nameLen = strlen(name); + thread->name = (char *)PR_Malloc(nameLen + 1); + if (!thread->name) + return PR_FAILURE; + memcpy(thread->name, name, nameLen + 1); + _PR_MD_SET_CURRENT_THREAD_NAME(thread->name); + return PR_SUCCESS; +} + +PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread) +{ + if (!thread) + return NULL; + return thread->name; +} + /* ** This routine prevents all other threads from running. This call is needed by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/prcthr.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/prcthr.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/prcthr.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/prcthr.c 2012-07-24 10:48:28.000000000 +0200 @@ -35,6 +35,7 @@ } thread->dump = 0; + PR_DELETE(thread->name); PR_DELETE(thread->errorString); thread->errorStringSize = 0; thread->errorStringLength = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.9.2/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/tests/vercheck.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/tests/vercheck.c 2012-07-24 10:48:28.000000000 +0200 @@ -20,9 +20,10 @@ #include <stdlib.h> /* - * This release (4.9.1) is backward compatible with the + * This release (4.9.2) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8.x, and 4.9 releases. It, of course, is compatible with itself. + * 4.8.x, 4.9, and 4.9.1 releases. It, of course, + * is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", @@ -34,7 +35,7 @@ "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", PR_VERSION + "4.9", "4.9.1", PR_VERSION }; /* @@ -49,7 +50,7 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.2", + "4.9.3", "4.10", "4.10.1", "10.0", "11.1", "12.14.20" }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nspr for openSUSE:Factory
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2012-07-25 10:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old) and /work/SRC/openSUSE:Factory/.mozilla-nspr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nspr", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2012-06-06 16:08:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new/mozilla-nspr.changes 2012-07-25 10:35:35.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 24 08:49:25 UTC 2012 - wr(a)rosenauer.org + +- update to version 4.9.2 + * new PR_SetThreadName and PR_GetThreadName functions for setting + and getting the name of the *current thread* + +------------------------------------------------------------------- Old: ---- nspr-4.9.1.tar.bz2 New: ---- nspr-4.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.8Ze4EF/_old 2012-07-25 10:35:39.000000000 +0200 +++ /var/tmp/diff_new_pack.8Ze4EF/_new 2012-07-25 10:35:39.000000000 +0200 @@ -18,7 +18,7 @@ Name: mozilla-nspr -Version: 4.9.1 +Version: 4.9.2 Release: 0 Summary: Netscape Portable Runtime License: MPL-2.0 ++++++ nspr-4.9.1.tar.bz2 -> nspr-4.9.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/admin/repackage.sh new/nspr-4.9.2/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.9.1/mozilla/nsprpub/admin/repackage.sh 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/admin/repackage.sh 2012-07-24 10:48:27.000000000 +0200 @@ -32,10 +32,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.9.1 -TOTOP=./v4.9.1 -NSPRDIR=nspr-4.9.1 -SOURCETAG=NSPR_4_9_1_RTM +FROMTOP=/share/builds/components/nspr20/v4.9.2 +TOTOP=./v4.9.2 +NSPRDIR=nspr-4.9.2 +SOURCETAG=NSPR_4_9_2_RTM # # enumerate Unix object directories on /s/b/c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/config/prdepend.h new/nspr-4.9.2/mozilla/nsprpub/config/prdepend.h --- old/nspr-4.9.1/mozilla/nsprpub/config/prdepend.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/config/prdepend.h 2012-07-24 10:48:27.000000000 +0200 @@ -10,4 +10,3 @@ */ #error "Do not include this header file." - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/configure new/nspr-4.9.2/mozilla/nsprpub/configure --- old/nspr-4.9.1/mozilla/nsprpub/configure 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/configure 2012-07-24 10:48:27.000000000 +0200 @@ -736,7 +736,7 @@ MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=1 +MOD_PATCH_VERSION=2 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/configure.in new/nspr-4.9.2/mozilla/nsprpub/configure.in --- old/nspr-4.9.1/mozilla/nsprpub/configure.in 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/configure.in 2012-07-24 10:48:27.000000000 +0200 @@ -15,7 +15,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=1 +MOD_PATCH_VERSION=2 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_win95.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_win95.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_win95.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_win95.h 2012-07-24 10:48:28.000000000 +0200 @@ -362,6 +362,7 @@ #define _MD_CREATE_THREAD _PR_MD_CREATE_THREAD #define _MD_YIELD _PR_MD_YIELD #define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY +#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME #define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD #define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK #define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_winnt.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_winnt.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/md/_winnt.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/md/_winnt.h 2012-07-24 10:48:28.000000000 +0200 @@ -376,6 +376,7 @@ #define _MD_END_THREAD _PR_MD_END_THREAD #define _MD_YIELD _PR_MD_YIELD #define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY +#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME #define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD #define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK #define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/prinit.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/prinit.h 2012-07-24 10:48:28.000000000 +0200 @@ -31,10 +31,10 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.9.1" +#define PR_VERSION "4.9.2" #define PR_VMAJOR 4 #define PR_VMINOR 9 -#define PR_VPATCH 1 +#define PR_VPATCH 2 #define PR_BETA PR_FALSE /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/private/primpl.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/private/primpl.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/private/primpl.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/private/primpl.h 2012-07-24 10:48:28.000000000 +0200 @@ -977,6 +977,9 @@ extern void _PR_MD_SET_PRIORITY(_MDThread *md, PRThreadPriority newPri); #define _PR_MD_SET_PRIORITY _MD_SET_PRIORITY +extern void _PR_MD_SET_CURRENT_THREAD_NAME(const char *name); +#define _PR_MD_SET_CURRENT_THREAD_NAME _MD_SET_CURRENT_THREAD_NAME + NSPR_API(void) _PR_MD_SUSPENDALL(void); #define _PR_MD_SUSPENDALL _MD_SUSPENDALL @@ -1533,6 +1536,7 @@ PRIntn errorStringLength; /* textLength from last call to PR_SetErrorText() */ PRInt32 errorStringSize; /* malloc()'d size of buffer | zero */ char *errorString; /* current error string | NULL */ + char *name; /* thread's name */ #if defined(_PR_PTHREADS) pthread_t id; /* pthread identifier for the thread */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/include/prthread.h new/nspr-4.9.2/mozilla/nsprpub/pr/include/prthread.h --- old/nspr-4.9.1/mozilla/nsprpub/pr/include/prthread.h 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/include/prthread.h 2012-07-24 10:48:28.000000000 +0200 @@ -145,6 +145,17 @@ NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority); /* +** Set the name of the current thread, which will be visible in a debugger +** and accessible via a call to PR_GetThreadName(). +*/ +NSPR_API(PRStatus) PR_SetCurrentThreadName(const char *name); + +/* +** Return the name of "thread", if set. Otherwise return NULL. +*/ +NSPR_API(const char *) PR_GetThreadName(const PRThread *thread); + +/* ** This routine returns a new index for per-thread-private data table. ** The index is visible to all threads within a process. This index can ** be used with the PR_SetThreadPrivate() and PR_GetThreadPrivate() routines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/ntthread.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/ntthread.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/ntthread.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/ntthread.c 2012-07-24 10:48:28.000000000 +0200 @@ -276,6 +276,42 @@ return; } +const DWORD MS_VC_EXCEPTION = 0x406D1388; + +#pragma pack(push,8) +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; // Must be 0x1000. + LPCSTR szName; // Pointer to name (in user addr space). + DWORD dwThreadID; // Thread ID (-1=caller thread). + DWORD dwFlags; // Reserved for future use, must be zero. +} THREADNAME_INFO; +#pragma pack(pop) + +void +_PR_MD_SET_CURRENT_THREAD_NAME(const char *name) +{ +#ifdef _MSC_VER + THREADNAME_INFO info; + + if (!IsDebuggerPresent()) + return; + + info.dwType = 0x1000; + info.szName = (char*) name; + info.dwThreadID = -1; + info.dwFlags = 0; + + __try { + RaiseException(MS_VC_EXCEPTION, + 0, + sizeof(info) / sizeof(ULONG_PTR), + (ULONG_PTR*)&info); + } __except(EXCEPTION_CONTINUE_EXECUTION) { + } +#endif +} + void _PR_MD_CLEAN_THREAD(PRThread *thread) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/w95thred.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/w95thred.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/md/windows/w95thred.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/md/windows/w95thred.c 2012-07-24 10:48:28.000000000 +0200 @@ -168,6 +168,42 @@ return; } +const DWORD MS_VC_EXCEPTION = 0x406D1388; + +#pragma pack(push,8) +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; // Must be 0x1000. + LPCSTR szName; // Pointer to name (in user addr space). + DWORD dwThreadID; // Thread ID (-1=caller thread). + DWORD dwFlags; // Reserved for future use, must be zero. +} THREADNAME_INFO; +#pragma pack(pop) + +void +_PR_MD_SET_CURRENT_THREAD_NAME(const char *name) +{ +#ifdef _MSC_VER + THREADNAME_INFO info; + + if (!IsDebuggerPresent()) + return; + + info.dwType = 0x1000; + info.szName = (char*) name; + info.dwThreadID = -1; + info.dwFlags = 0; + + __try { + RaiseException(MS_VC_EXCEPTION, + 0, + sizeof(info) / sizeof(ULONG_PTR), + (ULONG_PTR*)&info); + } __except(EXCEPTION_CONTINUE_EXECUTION) { + } +#endif +} + void _PR_MD_CLEAN_THREAD(PRThread *thread) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/nspr.def new/nspr-4.9.2/mozilla/nsprpub/pr/src/nspr.def --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/nspr.def 2012-06-01 16:48:44.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/nspr.def 2012-07-24 10:48:28.000000000 +0200 @@ -446,3 +446,8 @@ ;+ global: PR_GetVersion; ;+} NSPR_4.8; +;+NSPR_4.9.2 { +;+ global: + PR_GetThreadName; + PR_SetCurrentThreadName; +;+} NSPR_4.8.9; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/pthreads/ptthread.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/pthreads/ptthread.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-07-24 10:48:28.000000000 +0200 @@ -19,6 +19,7 @@ #include <unistd.h> #include <string.h> #include <signal.h> +#include <dlfcn.h> #ifdef SYMBIAN /* In Open C sched_get_priority_min/max do not work properly, so we undefine @@ -794,6 +795,8 @@ PR_Free(thred->privateData); if (NULL != thred->errorString) PR_Free(thred->errorString); + if (NULL != thred->name) + PR_Free(thred->name); PR_Free(thred->stack); if (NULL != thred->syspoll_list) PR_Free(thred->syspoll_list); @@ -1612,6 +1615,88 @@ #endif /* !defined(_PR_DCETHREADS) */ +PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name) +{ + PRThread *thread; + size_t nameLen; + int result; + + if (!name) { + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + + thread = PR_GetCurrentThread(); + if (!thread) + return PR_FAILURE; + + PR_Free(thread->name); + nameLen = strlen(name); + thread->name = (char *)PR_Malloc(nameLen + 1); + if (!thread->name) + return PR_FAILURE; + memcpy(thread->name, name, nameLen + 1); + +#if defined(OPENBSD) || defined(FREEBSD) + result = pthread_set_name_np(thread->id, name); +#else /* not BSD */ + /* + * On OSX, pthread_setname_np is only available in 10.6 or later, so test + * for it at runtime. It also may not be available on all linux distros. + */ +#if defined(DARWIN) + int (*dynamic_pthread_setname_np)(const char*); +#else + int (*dynamic_pthread_setname_np)(pthread_t, const char*); +#endif + + *(void**)(&dynamic_pthread_setname_np) = + dlsym(RTLD_DEFAULT, "pthread_setname_np"); + if (!dynamic_pthread_setname_np) + return PR_SUCCESS; + + /* + * The 15-character name length limit is an experimentally determined + * length of a null-terminated string that most linux distros and OS X + * accept as an argument to pthread_setname_np. Otherwise the E2BIG + * error is returned by the function. + */ +#define SETNAME_LENGTH_CONSTRAINT 15 +#define SETNAME_FRAGMENT1_LENGTH (SETNAME_LENGTH_CONSTRAINT >> 1) +#define SETNAME_FRAGMENT2_LENGTH \ + (SETNAME_LENGTH_CONSTRAINT - SETNAME_FRAGMENT1_LENGTH - 1) + char name_dup[SETNAME_LENGTH_CONSTRAINT + 1]; + if (nameLen > SETNAME_LENGTH_CONSTRAINT) { + memcpy(name_dup, name, SETNAME_FRAGMENT1_LENGTH); + name_dup[SETNAME_FRAGMENT1_LENGTH] = '~'; + /* Note that this also copies the null terminator. */ + memcpy(name_dup + SETNAME_FRAGMENT1_LENGTH + 1, + name + nameLen - SETNAME_FRAGMENT2_LENGTH, + SETNAME_FRAGMENT2_LENGTH + 1); + name = name_dup; + } + +#if defined(DARWIN) + result = dynamic_pthread_setname_np(name); +#else + result = dynamic_pthread_setname_np(thread->id, name); +#endif +#endif /* not BSD */ + + if (result) { + PR_SetError(PR_UNKNOWN_ERROR, result); + return PR_FAILURE; + } + return PR_SUCCESS; +} + +PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread) +{ + if (!thread) + return NULL; + return thread->name; +} + #endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */ /* ptthread.c */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/combined/pruthr.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/combined/pruthr.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/combined/pruthr.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/combined/pruthr.c 2012-07-24 10:48:28.000000000 +0200 @@ -237,6 +237,7 @@ PR_ASSERT(thread->dumpArg == 0 && thread->dump == 0); PR_ASSERT(thread->errorString == 0 && thread->errorStringSize == 0); PR_ASSERT(thread->errorStringLength == 0); + PR_ASSERT(thread->name == 0); /* Reset data members in thread structure */ thread->errorCode = thread->osErrorCode = 0; @@ -1581,6 +1582,37 @@ } else _PR_SetThreadPriority(thread, newPri); } +PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name) +{ + PRThread *thread; + size_t nameLen; + + if (!name) { + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + + thread = PR_GetCurrentThread(); + if (!thread) + return PR_FAILURE; + + PR_Free(thread->name); + nameLen = strlen(name); + thread->name = (char *)PR_Malloc(nameLen + 1); + if (!thread->name) + return PR_FAILURE; + memcpy(thread->name, name, nameLen + 1); + _PR_MD_SET_CURRENT_THREAD_NAME(thread->name); + return PR_SUCCESS; +} + +PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread) +{ + if (!thread) + return NULL; + return thread->name; +} + /* ** This routine prevents all other threads from running. This call is needed by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/prcthr.c new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/prcthr.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/src/threads/prcthr.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/src/threads/prcthr.c 2012-07-24 10:48:28.000000000 +0200 @@ -35,6 +35,7 @@ } thread->dump = 0; + PR_DELETE(thread->name); PR_DELETE(thread->errorString); thread->errorStringSize = 0; thread->errorStringLength = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nspr-4.9.1/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.9.2/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.9.1/mozilla/nsprpub/pr/tests/vercheck.c 2012-06-01 16:48:45.000000000 +0200 +++ new/nspr-4.9.2/mozilla/nsprpub/pr/tests/vercheck.c 2012-07-24 10:48:28.000000000 +0200 @@ -20,9 +20,10 @@ #include <stdlib.h> /* - * This release (4.9.1) is backward compatible with the + * This release (4.9.2) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8.x, and 4.9 releases. It, of course, is compatible with itself. + * 4.8.x, 4.9, and 4.9.1 releases. It, of course, + * is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", @@ -34,7 +35,7 @@ "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", PR_VERSION + "4.9", "4.9.1", PR_VERSION }; /* @@ -49,7 +50,7 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.2", + "4.9.3", "4.10", "4.10.1", "10.0", "11.1", "12.14.20" }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit module-init-tools for openSUSE:Factory
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at 2012-07-25 10:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/module-init-tools (Old) and /work/SRC/openSUSE:Factory/.module-init-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "module-init-tools", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/module-init-tools/module-init-tools.changes 2012-06-26 17:07:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.module-init-tools.new/module-init-tools.changes 2012-07-25 10:35:07.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 8 09:00:56 UTC 2012 - agraf(a)suse.com + +- add support for uImage based kernels + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weak-modules ++++++ --- /var/tmp/diff_new_pack.Kq5T1p/_old 2012-07-25 10:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Kq5T1p/_new 2012-07-25 10:35:09.000000000 +0200 @@ -311,7 +311,7 @@ [ -e /boot/System.map-$krel ] || continue image= - for x in vmlinuz image vmlinux linux bzImage; do + for x in vmlinuz image vmlinux linux bzImage uImage; do if [ -f /boot/$x-$krel ]; then image=$x break ++++++ weak-modules2 ++++++ --- /var/tmp/diff_new_pack.Kq5T1p/_old 2012-07-25 10:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Kq5T1p/_new 2012-07-25 10:35:09.000000000 +0200 @@ -338,7 +338,7 @@ fi if needs_mkinitrd $krel; then local image - for x in vmlinuz image vmlinux linux bzImage; do + for x in vmlinuz image vmlinux linux bzImage uImage; do if [ -f /boot/$x-$krel ]; then image=$x break -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit module-init-tools for openSUSE:12.2
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package module-init-tools for openSUSE:12.2 checked in at 2012-07-25 10:35:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/module-init-tools (Old) and /work/SRC/openSUSE:12.2/.module-init-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "module-init-tools", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/module-init-tools/module-init-tools.changes 2012-06-26 17:07:49.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.module-init-tools.new/module-init-tools.changes 2012-07-25 10:35:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jul 8 09:00:56 UTC 2012 - agraf(a)suse.com + +- add support for uImage based kernels + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weak-modules ++++++ --- /var/tmp/diff_new_pack.XpjRq4/_old 2012-07-25 10:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.XpjRq4/_new 2012-07-25 10:35:09.000000000 +0200 @@ -311,7 +311,7 @@ [ -e /boot/System.map-$krel ] || continue image= - for x in vmlinuz image vmlinux linux bzImage; do + for x in vmlinuz image vmlinux linux bzImage uImage; do if [ -f /boot/$x-$krel ]; then image=$x break ++++++ weak-modules2 ++++++ --- /var/tmp/diff_new_pack.XpjRq4/_old 2012-07-25 10:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.XpjRq4/_new 2012-07-25 10:35:09.000000000 +0200 @@ -338,7 +338,7 @@ fi if needs_mkinitrd $krel; then local image - for x in vmlinuz image vmlinux linux bzImage; do + for x in vmlinuz image vmlinux linux bzImage uImage; do if [ -f /boot/$x-$krel ]; then image=$x break -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mc for openSUSE:Factory
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package mc for openSUSE:Factory checked in at 2012-07-25 10:34:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mc (Old) and /work/SRC/openSUSE:Factory/.mc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mc", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mc/mc.changes 2012-06-05 15:33:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mc.new/mc.changes 2012-07-25 10:34:34.000000000 +0200 @@ -1,0 +2,38 @@ +Mon Jul 23 13:35:04 UTC 2012 - subchaser1(a)gmail.com + +- extfs deb helper: execute uar helper as fall-back if deb utilities is not installed + +------------------------------------------------------------------- +Sat Jul 21 10:54:16 UTC 2012 - subchaser1(a)gmail.com + +- fixed deb file extension support, use dpkg-deb from 'deb' package + if installed + +------------------------------------------------------------------- +Sat Jul 21 09:39:11 UTC 2012 - subchaser1(a)gmail.com + +Updated to version 4.8.1.4 + +- Misc + * Tweak and cleanup of code in case of --disable-charset option usage (#2827) + * File extension support: + - .gem - rubygems (#2797) + - .cpio.xz - compressed cpio archives (#2798) + +- Fixes + * Build failure on FreeBSD 6 (#2808) + * src/filemanager/filegui.c does not compile on Solaris due to missing macros (#2825) + * Loss of data on copy to full partition (#2829) + * Misinterpretation of dirs as command line arguments (#2783, #2805) + * Number of panelized files was limited to 127 (#2813) + * URL with port was stored wrong in history (#2833) + * Can't find 00 (zeroes) in patterns in hex search (#2795) + * Hotkey conflicts in 'Search' dialog (#2843) + * Garbage directory listing in ftpfs (#2800) + * Incomplete sand256 skin (#2807) + * mcedit scripts are installed as data files (#1437) + * Tests failure on PowerPC,S390,S390x (#2804) + * Fail to compile if --without-vfs configure option specified (#2834) + * do_panel_cd: FTBFS with --enable-tests on [kfreebsd-i386,kfreebsd-amd64,ia64,armhf] (#2803) + +------------------------------------------------------------------- Old: ---- 04_add_gem_extension.patch mc-4.8.1.3.tar.xz New: ---- mc-4.8.1.4.tar.xz mc-extfs-helpers-deb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ --- /var/tmp/diff_new_pack.5FMt2n/_old 2012-07-25 10:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.5FMt2n/_new 2012-07-25 10:34:36.000000000 +0200 @@ -21,8 +21,8 @@ License: GPL-3.0+ Group: Productivity/File utilities Url: http://www.midnight-commander.org/ -Version: 4.8.1.3 -Release: 0 +Version: 4.8.1.4 +Release: 0.0 Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz Source1: x11_browser Source2: %{name}.desktop @@ -41,10 +41,10 @@ Patch16: mc-esc-seq.patch Patch17: mc-rpm.patch Patch20: mc-f-keys.patch +Patch21: mc-extfs-helpers-deb.patch #debian fixes for vfs Patch24: 02_ignore_ftp_chmod_error.patch #Debian fixes -Patch30: 04_add_gem_extension.patch Patch31: 09_uzip_broken_528239.patch Patch32: 20_wrong_path_to_wrappers.patch # PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec(a)suse.cz - Fixed Esc + Numeral F-key emulation. @@ -116,8 +116,8 @@ %patch17 %patch18 %patch20 +%patch21 %patch24 -%patch30 %patch31 %patch32 %patch41 ++++++ mc-extensions.patch ++++++ --- /var/tmp/diff_new_pack.5FMt2n/_old 2012-07-25 10:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.5FMt2n/_new 2012-07-25 10:34:36.000000000 +0200 @@ -1,58 +1,54 @@ -Index: misc/mc.ext.in -=================================================================== ---- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200 -+++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200 -@@ -226,8 +226,10 @@ regex/\.rpm$ +--- misc/mc.ext.in.orig 2012-07-23 14:07:11.000000000 +0200 ++++ misc/mc.ext.in 2012-07-23 14:11:39.000000000 +0200 +@@ -236,8 +236,9 @@ # deb regex/\.u?deb$ - Open=%cd %p/deb:// - View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f -+# Open=%cd %p/deb:// -+# View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f -+ Open=%cd %p#uar:// -+ View=%view{ascii} file %f && nm %f ++ Open=%cd %p/deb:// ++ #Open=%cd %p/uar:// ++ View=%view{ascii} if type -p dpkg-deb >/dev/null ; then dpkg-deb -I %f && echo && dpkg-deb -c %f ; else file %f && echo && ar tv %f ; fi # dpkg shell/.debd -@@ -399,7 +399,8 @@ include/image +@@ -415,7 +416,8 @@ ### Sound files ### regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$ - Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Include=audio regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$ Open=mikmod %f -@@ -409,15 +410,22 @@ regex/\.([wW][aA][wW]22)$ +@@ -425,15 +427,21 @@ Open=vplay -s 22 %f regex/\.([mM][pP]3)$ - Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi - View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' -+ Include=audio -+# Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi -+# View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' ++ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi ++ #View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' ++ Include=audio + +regex/\.([mM][kK][aA])$ -+ Include=audio ++ Include=audio regex/\.([oO][gG][gG|aA|vV|xX])$ - Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=ogg123 %f -+# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi ++ Include=audio View=%view{ascii} ogginfo %s regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$ - Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi -+ Include=audio -+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Include=audio regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$ Open=timidity %f -@@ -426,11 +434,15 @@ regex/\.([wW][mM][aA])$ +@@ -442,11 +450,15 @@ Open=mplayer -vo null %f View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f @@ -64,63 +60,67 @@ regex/\.([mM]3[uU]|[pP][lL][sS])$ - Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi ++ #Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi + Open=mplayer -vo null -playlist %f -+# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi ### Video ### -@@ -478,12 +490,12 @@ include/video +@@ -502,14 +514,16 @@ # Postscript type/^PostScript - Open=(gv %f >/dev/null 2>&1 &) ++ #Open=(gv %f >/dev/null 2>&1 &) + Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} ps2ascii %f # PDF type/^PDF - Open=(xpdf %f >/dev/null 2>&1 &) -+ Open=(xdg-open %f >/dev/null 2>&1 &) ++ #Open=(xpdf %f >/dev/null 2>&1 &) #Open=(acroread %f &) #Open=(ghostview %f &) ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} pdftotext %f - -@@ -511,27 +523,33 @@ shell/.abw + + # The following code very ugly and should not be taken as example. +@@ -535,27 +549,33 @@ # Microsoft Word Document type/^Microsoft\ Office\ Document - Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} wvText %f - || strings %f type/^Microsoft\ Word - Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} wvText %f - || strings %f regex/\.([Dd]ot|DOT|[Ww]ri|WRI)$ - Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} wvText %f - || strings %f # RTF document regex/\.([rR][tT][fF])$ - Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) # Microsoft Excel Worksheet regex/\.([xX][lL][sSwW])$ - Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f type/^Microsoft\ Excel - Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null -+ Open=(xdg-open %f &) -+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ #Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null ++ Open=(xdg-open %f >/dev/null 2>&1 &) View=%view{ascii} xls2csv %f || strings %f # Framemaker ++++++ mc-extfs-helpers-deb.patch ++++++ --- src/vfs/extfs/helpers/deb.in.orig 2012-04-20 11:21:37.000000000 +0400 +++ src/vfs/extfs/helpers/deb.in 2012-07-23 17:21:47.000000000 +0400 @@ -176,6 +176,15 @@ } } +sub _which +{ + my $app = shift; + foreach my $dir (split/:/, $ENV{'PATH'}) { + return "$dir/$app" if -x "$dir/$app"; + } + return undef; +} + $pressinstall=<<EOInstall; WARNING @@ -192,6 +201,20 @@ umask 077; + +# check for required dpkg utilities +my $dpkg_deb = _which('dpkg-deb'); +my $dpkg = _which('dpkg'); + +# use uar extfs-heper if not exists +if (not defined $dpkg_deb or not defined $dpkg) +{ + if ($0 =~ /^(.*)\/deb$/) { + my $uar = "$1/uar" ; + exec $uar, @ARGV; + } +} + if($ARGV[0] eq "list") { shift; &mcdebfs_list(@ARGV); exit 0; } elsif($ARGV[0] eq "copyout") { shift; &mcdebfs_copyout(@ARGV); exit 0; } elsif($ARGV[0] eq "run") { shift; &mcdebfs_run(@ARGV); exit 0; } ++++++ mc-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.5FMt2n/_old 2012-07-25 10:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.5FMt2n/_new 2012-07-25 10:34:36.000000000 +0200 @@ -1,3 +1,2 @@ addFilter("mc\..* W: script-without-shebang /usr/lib/mc/fish/.+") addFilter("mc\..* W: script-without-shebang /usr/share/mc/mc.*\.c?sh") -addFilter("mc\..* W: non-executable-script /etc/mc/edit.(spell|indent).rc") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apport for openSUSE:Factory
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package apport for openSUSE:Factory checked in at 2012-07-25 10:33:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apport (Old) and /work/SRC/openSUSE:Factory/.apport.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apport", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apport/apport.changes 2011-09-23 01:51:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apport.new/apport.changes 2012-07-25 10:33:28.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 23 15:39:44 UTC 2012 - werner(a)suse.de + +- Make it build with latest TeXLive 2012 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apport.spec ++++++ --- /var/tmp/diff_new_pack.VcYLGi/_old 2012-07-25 10:33:29.000000000 +0200 +++ /var/tmp/diff_new_pack.VcYLGi/_new 2012-07-25 10:33:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apport # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007-2008 Nikolay Derkach <nderkach(a)gmail.com> # # All modifications and additions to the file contributed by third parties @@ -21,17 +21,36 @@ Name: apport Summary: Automatic crash handler -Version: 0.114 -Release: 24 License: GPL-2.0+ +Group: System/Monitoring +Version: 0.114 +Release: 0 Url: https://launchpad.net/apport BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: intltool python-devel texlive-latex -Requires: python python-m2crypto python-xml python-zypp rpm-python +BuildRequires: intltool +BuildRequires: python-devel +BuildRequires: texlive-latex +%if %suse_version > 1220 +BuildRequires: texlive-amsfonts +BuildRequires: texlive-cm +BuildRequires: texlive-cm-super +BuildRequires: texlive-pdftex +%endif Requires: apport-crashdb +Requires: python +Requires: python-m2crypto +Requires: python-xml +Requires: python-zypp +Requires: rpm-python # Need the ability to use pipes in /proc/sys/kernel/core_pattern Conflicts: kernel < 2.6.24 -Requires: coreutils cron binutils gdb lsb-release module-init-tools ptools +Requires: binutils +Requires: coreutils +Requires: cron +Requires: gdb +Requires: lsb-release +Requires: module-init-tools +Requires: ptools Source0: %{name}-%{version}%{revno}.tar.bz2 Source1: rc.apport Source2: crashdb.conf @@ -43,7 +62,6 @@ Patch2: apport-fix_fail_msg.diff Patch3: apport-cli_use_less.patch Patch4: apport-anonymize-report.patch -Group: System/Monitoring %description Apport automatically collects data from crashed processes and compiles @@ -53,11 +71,11 @@ information. %package crashdb-opensuse -License: GPL-2.0+ Summary: Automatic crash handler Group: System/Monitoring Requires: apport = %{version}-%{release} -Requires: python-m2crypto python-base >= 2.6 +Requires: python-base >= 2.6 +Requires: python-m2crypto Provides: apport-crashdb %description crashdb-opensuse @@ -68,22 +86,22 @@ information. %package gtk -License: GPL-2.0+ Summary: GTK frontend for the apport crash report system Group: System/Monitoring -Requires: python-gtk procps Requires: apport = %{version}-%{release} +Requires: procps +Requires: python-gtk Supplements: packageand(apport:python-gtk) %description gtk This package contains the GTK frontend for the apport crash report system. %package qt -License: GPL-2.0+ Summary: Qt4 frontend for the apport crash report system Group: System/Monitoring -Requires: python-qt4 procps Requires: apport = %{version}-%{release} +Requires: procps +Requires: python-qt4 Supplements: packageand(apport:python-qt4) %description qt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjpeg-turbo for openSUSE:12.2
by root＠hilbert.suse.de 25 Jul '12

25 Jul '12

Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:12.2 checked in at 2012-07-25 08:16:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libjpeg-turbo (Old) and /work/SRC/openSUSE:12.2/.libjpeg-turbo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjpeg-turbo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/libjpeg-turbo/libjpeg-turbo.changes 2012-07-24 22:44:12.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libjpeg-turbo.new/libjpeg-turbo.changes 2012-07-25 08:16:46.000000000 +0200 @@ -2,24 +1,0 @@ -Mon Jul 23 11:33:56 UTC 2012 - pgajdos(a)suse.com - -- Update to version 1.2.1: - * fixed heap overflow [bnc#771791] - -------------------------------------------------------------------- -Thu Mar 22 13:25:09 UTC 2012 - idonmez(a)suse.com - -- Update to version 1.2.0 - * Fixed out-of-bounds read in SSE2 SIMD code - * Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can - be used to check the version of libjpeg-turbo against which - an application was compiled. - * Added new RGBA/BGRA/ABGR/ARGB colorspace extension constants - * libjpeg-turbo will now correctly decompress erroneous - CMYK/YCCK JPEGs whose K component is assigned a component ID - of 1 instead of 4. - * Added SIMD routines for RGB-to-grayscale color conversion - * Improved the performance of the C color conversion routines - * Added a function to the TurboJPEG API that performs lossless - transforms. - * Added support for 4:4:0 (transposed 4:2:2) subsampling - -------------------------------------------------------------------- Old: ---- libjpeg-turbo-1.2.1-int32.patch libjpeg-turbo-1.2.1-tiff-ojpeg.patch libjpeg-turbo-1.2.1.tar.gz New: ---- libjpeg-turbo-1.1.1-int32.patch libjpeg-turbo-1.1.1-tiff-ojpeg.patch libjpeg-turbo-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libjpeg-turbo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,34 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild -%define major 8 +%define major 62 %define minor 0 -%define micro 2 -%define srcver 1.2.1 +%define micro 0 +%define srcver 1.1.1 %define libver %{major}.%{minor}.%{micro} # major number of library from jpeg8 %define cmajor 8 Name: libjpeg-turbo -Version: %{srcver} -Release: 0 -Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files License: BSD-3-Clause Group: Productivity/Graphics/Convertors +Version: %{srcver} +Release: 1 +Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Url: http://sourceforge.net/projects/libjpeg-turbo -Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{versi… +BuildRequires: gcc-c++ libtool nasm +Provides: jpeg = %{version} +Obsoletes: jpeg +Conflicts: jpeg%{major} +Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch0: %{name}-%{version}-int32.patch Patch1: %{name}-%{version}-tiff-ojpeg.patch Patch2: libjpeg-ocloexec.patch -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: yasm -Provides: jpeg = %{version} -Obsoletes: jpeg < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: jpeg%{major} %description The libjpeg-turbo package contains a library of functions for manipulating @@ -50,16 +49,18 @@ %package -n libjpeg%{major} -Version: %{libver} -Release: 0 +License: BSD-3-Clause Summary: The MMX/SSE accelerated JPEG compression/decompression library -Group: System/Libraries +Version: %{libver} + -Provides: libjpeg%{major} = %{version} -Obsoletes: libjpeg%{major} < %{version} +Provides: libjpeg6 = %{version} +Obsoletes: libjpeg6 +Group: System/Libraries +AutoReqProv: on # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-64bit < %{version} +Obsoletes: libjpeg-64bit %endif # @@ -67,27 +68,36 @@ This library contains MMX/SSE accelerated functions for manipulating JPEG images. + +Authors: +-------- + Rob Hooft <hooft(a)EMBL-Heidelberg.DE> + Michael Mauldin <mlm(a)cs.cmu.edu> + %package -n libjpeg%{major}-devel -Version: %{libver} -Release: 0 +License: BSD-3-Clause Summary: Development Tools for applications which will use the Libjpeg Library -Group: Development/Libraries/C and C++ +Version: %{libver} + +Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} -Obsoletes: libjpeg-devel < %{version} +Obsoletes: libjpeg-devel Conflicts: libjpeg%{cmajor}-devel # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-devel-64bit < %{version} +Obsoletes: libjpeg-devel-64bit %endif # -%description -n libjpeg%{major}-devel +%description -n libjpeg62-devel The libjpeg-devel package includes the header files and libraries necessary for compiling and linking programs which will manipulate JPEG files using the libjpeg library. + + %prep %setup -q %patch0 @@ -96,29 +106,25 @@ %build autoreconf -fiv -%configure --disable-static \ - --with-jpeg8 +%configure --disable-static make %{?_smp_mflags} %check make test libdir=%{_libdir} %install -%makeinstall - +make install DESTDIR=$RPM_BUILD_ROOT # Fix perms -chmod -x README-turbo.txt release/copyright - +chmod -x README-turbo.txt # Remove unwanted files -rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la - +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{,turbo}jpeg.la # Don't distribute libjpegturbo because it is unversioned -rm %{buildroot}%{_includedir}/turbojpeg.h -rm %{buildroot}%{_libdir}/libturbojpeg.so -rm %{buildroot}%{_bindir}/tjbench +rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h +rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so +rm $RPM_BUILD_ROOT%{_bindir}/jpgtest -# Remove docs, we'll select docs manually -rm -rf %{buildroot}%{_datadir}/doc/ +%clean +rm -rf $RPM_BUILD_ROOT %post -n libjpeg%{major} -p /sbin/ldconfig @@ -126,9 +132,9 @@ %files %defattr(-,root,root) -%doc README README-turbo.txt change.log ChangeLog.txt -%doc release/copyright usage.txt wizard.txt -%{_bindir}/* +%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt +%doc LICENSE.txt usage.txt wizard.txt +/usr/bin/* %doc %{_mandir}/man1/* %files -n libjpeg%{major} @@ -138,7 +144,7 @@ %files -n libjpeg%{major}-devel %defattr(-,root,root) -%{_includedir}/*.h +/usr/include/*.h %{_libdir}/libjpeg.so %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -1,2 +1,2 @@ -libjpeg8 -libjpeg8-devel +libjpeg62 +libjpeg62-devel ++++++ libjpeg-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -83,21 +83,12 @@ } --- bmp.c.orig +++ bmp.c -@@ -112,7 +112,7 @@ int loadbmp(char *filename, unsigned cha - if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF) - _throw("loadbmp(): Invalid argument"); +@@ -257,7 +257,7 @@ int saveppm(char *filename, unsigned cha + FILE *fs=NULL; int retcode=0; + unsigned char *tempbuf=NULL; -- if((file=fopen(filename, "rb"))==NULL) -+ if((file=fopen(filename, READ_BINARY))==NULL) - _throwunix("loadbmp(): Cannot open input file"); - - cinfo.err=jpeg_std_error(&jerr.pub); -@@ -196,7 +196,7 @@ int savebmp(char *filename, unsigned cha - if(!filename || !buf || w<1 || h<1 || srcpf<0 || srcpf>=TJ_NUMPF) - _throw("savebmp(): Invalid argument"); - -- if((file=fopen(filename, "wb"))==NULL) -+ if((file=fopen(filename, WRITE_BINARY))==NULL) - _throwunix("savebmp(): Cannot open output file"); - - dinfo.err=jpeg_std_error(&jerr.pub); +- if((fs=fopen(filename, "wb"))==NULL) _throw(strerror(errno)); ++ if((fs=fopen(filename, "wbe"))==NULL) _throw(strerror(errno)); + if(fprintf(fs, "P6\n")<1) _throw("Write error"); + if(fprintf(fs, "%d %d\n", w, h)<1) _throw("Write error"); + if(fprintf(fs, "255\n")<1) _throw("Write error"); ++++++ libjpeg-turbo-1.2.1-int32.patch -> libjpeg-turbo-1.1.1-int32.patch ++++++ ++++++ libjpeg-turbo-1.2.1-tiff-ojpeg.patch -> libjpeg-turbo-1.1.1-tiff-ojpeg.patch ++++++ ++++++ libjpeg-turbo-1.2.1.tar.gz -> libjpeg-turbo-1.1.1.tar.bz2 ++++++ ++++ 42941 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjpeg-turbo for openSUSE:12.2
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:12.2 checked in at 2012-07-24 22:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libjpeg-turbo (Old) and /work/SRC/openSUSE:12.2/.libjpeg-turbo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjpeg-turbo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/libjpeg-turbo/libjpeg-turbo.changes 2012-06-25 15:44:12.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libjpeg-turbo.new/libjpeg-turbo.changes 2012-07-24 22:44:12.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Jul 23 11:33:56 UTC 2012 - pgajdos(a)suse.com + +- Update to version 1.2.1: + * fixed heap overflow [bnc#771791] + +------------------------------------------------------------------- +Thu Mar 22 13:25:09 UTC 2012 - idonmez(a)suse.com + +- Update to version 1.2.0 + * Fixed out-of-bounds read in SSE2 SIMD code + * Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can + be used to check the version of libjpeg-turbo against which + an application was compiled. + * Added new RGBA/BGRA/ABGR/ARGB colorspace extension constants + * libjpeg-turbo will now correctly decompress erroneous + CMYK/YCCK JPEGs whose K component is assigned a component ID + of 1 instead of 4. + * Added SIMD routines for RGB-to-grayscale color conversion + * Improved the performance of the C color conversion routines + * Added a function to the TurboJPEG API that performs lossless + transforms. + * Added support for 4:4:0 (transposed 4:2:2) subsampling + +------------------------------------------------------------------- Old: ---- libjpeg-turbo-1.1.1-int32.patch libjpeg-turbo-1.1.1-tiff-ojpeg.patch libjpeg-turbo-1.1.1.tar.bz2 New: ---- libjpeg-turbo-1.2.1-int32.patch libjpeg-turbo-1.2.1-tiff-ojpeg.patch libjpeg-turbo-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.0x97cv/_old 2012-07-24 22:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0x97cv/_new 2012-07-24 22:44:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libjpeg-turbo # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define major 62 +%define major 8 %define minor 0 -%define micro 0 -%define srcver 1.1.1 +%define micro 2 +%define srcver 1.2.1 %define libver %{major}.%{minor}.%{micro} # major number of library from jpeg8 %define cmajor 8 Name: libjpeg-turbo -License: BSD-3-Clause -Group: Productivity/Graphics/Convertors Version: %{srcver} -Release: 1 +Release: 0 Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files +License: BSD-3-Clause +Group: Productivity/Graphics/Convertors Url: http://sourceforge.net/projects/libjpeg-turbo -BuildRequires: gcc-c++ libtool nasm -Provides: jpeg = %{version} -Obsoletes: jpeg -Conflicts: jpeg%{major} -Source0: %{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{versi… Source1: baselibs.conf Patch0: %{name}-%{version}-int32.patch Patch1: %{name}-%{version}-tiff-ojpeg.patch Patch2: libjpeg-ocloexec.patch +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: yasm +Provides: jpeg = %{version} +Obsoletes: jpeg < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: jpeg%{major} %description The libjpeg-turbo package contains a library of functions for manipulating @@ -49,18 +50,16 @@ %package -n libjpeg%{major} -License: BSD-3-Clause -Summary: The MMX/SSE accelerated JPEG compression/decompression library Version: %{libver} - - -Provides: libjpeg6 = %{version} -Obsoletes: libjpeg6 +Release: 0 +Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries -AutoReqProv: on + +Provides: libjpeg%{major} = %{version} +Obsoletes: libjpeg%{major} < %{version} # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-64bit +Obsoletes: libjpeg-64bit < %{version} %endif # @@ -68,36 +67,27 @@ This library contains MMX/SSE accelerated functions for manipulating JPEG images. - -Authors: --------- - Rob Hooft <hooft(a)EMBL-Heidelberg.DE> - Michael Mauldin <mlm(a)cs.cmu.edu> - %package -n libjpeg%{major}-devel -License: BSD-3-Clause -Summary: Development Tools for applications which will use the Libjpeg Library Version: %{libver} - - +Release: 0 +Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ + Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} -Obsoletes: libjpeg-devel +Obsoletes: libjpeg-devel < %{version} Conflicts: libjpeg%{cmajor}-devel # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-devel-64bit +Obsoletes: libjpeg-devel-64bit < %{version} %endif # -%description -n libjpeg62-devel +%description -n libjpeg%{major}-devel The libjpeg-devel package includes the header files and libraries necessary for compiling and linking programs which will manipulate JPEG files using the libjpeg library. - - %prep %setup -q %patch0 @@ -106,25 +96,29 @@ %build autoreconf -fiv -%configure --disable-static +%configure --disable-static \ + --with-jpeg8 make %{?_smp_mflags} %check make test libdir=%{_libdir} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall + # Fix perms -chmod -x README-turbo.txt +chmod -x README-turbo.txt release/copyright + # Remove unwanted files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib{,turbo}jpeg.la +rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la + # Don't distribute libjpegturbo because it is unversioned -rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h -rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so -rm $RPM_BUILD_ROOT%{_bindir}/jpgtest +rm %{buildroot}%{_includedir}/turbojpeg.h +rm %{buildroot}%{_libdir}/libturbojpeg.so +rm %{buildroot}%{_bindir}/tjbench -%clean -rm -rf $RPM_BUILD_ROOT +# Remove docs, we'll select docs manually +rm -rf %{buildroot}%{_datadir}/doc/ %post -n libjpeg%{major} -p /sbin/ldconfig @@ -132,9 +126,9 @@ %files %defattr(-,root,root) -%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt -%doc LICENSE.txt usage.txt wizard.txt -/usr/bin/* +%doc README README-turbo.txt change.log ChangeLog.txt +%doc release/copyright usage.txt wizard.txt +%{_bindir}/* %doc %{_mandir}/man1/* %files -n libjpeg%{major} @@ -144,7 +138,7 @@ %files -n libjpeg%{major}-devel %defattr(-,root,root) -/usr/include/*.h +%{_includedir}/*.h %{_libdir}/libjpeg.so %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.0x97cv/_old 2012-07-24 22:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0x97cv/_new 2012-07-24 22:44:12.000000000 +0200 @@ -1,2 +1,2 @@ -libjpeg62 -libjpeg62-devel +libjpeg8 +libjpeg8-devel ++++++ libjpeg-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.0x97cv/_old 2012-07-24 22:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0x97cv/_new 2012-07-24 22:44:12.000000000 +0200 @@ -83,12 +83,21 @@ } --- bmp.c.orig +++ bmp.c -@@ -257,7 +257,7 @@ int saveppm(char *filename, unsigned cha - FILE *fs=NULL; int retcode=0; - unsigned char *tempbuf=NULL; +@@ -112,7 +112,7 @@ int loadbmp(char *filename, unsigned cha + if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF) + _throw("loadbmp(): Invalid argument"); -- if((fs=fopen(filename, "wb"))==NULL) _throw(strerror(errno)); -+ if((fs=fopen(filename, "wbe"))==NULL) _throw(strerror(errno)); - if(fprintf(fs, "P6\n")<1) _throw("Write error"); - if(fprintf(fs, "%d %d\n", w, h)<1) _throw("Write error"); - if(fprintf(fs, "255\n")<1) _throw("Write error"); +- if((file=fopen(filename, "rb"))==NULL) ++ if((file=fopen(filename, READ_BINARY))==NULL) + _throwunix("loadbmp(): Cannot open input file"); + + cinfo.err=jpeg_std_error(&jerr.pub); +@@ -196,7 +196,7 @@ int savebmp(char *filename, unsigned cha + if(!filename || !buf || w<1 || h<1 || srcpf<0 || srcpf>=TJ_NUMPF) + _throw("savebmp(): Invalid argument"); + +- if((file=fopen(filename, "wb"))==NULL) ++ if((file=fopen(filename, WRITE_BINARY))==NULL) + _throwunix("savebmp(): Cannot open output file"); + + dinfo.err=jpeg_std_error(&jerr.pub); ++++++ libjpeg-turbo-1.1.1-int32.patch -> libjpeg-turbo-1.2.1-int32.patch ++++++ ++++++ libjpeg-turbo-1.1.1-tiff-ojpeg.patch -> libjpeg-turbo-1.2.1-tiff-ojpeg.patch ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjpeg-turbo for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:Factory checked in at 2012-07-24 22:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjpeg-turbo (Old) and /work/SRC/openSUSE:Factory/.libjpeg-turbo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjpeg-turbo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libjpeg-turbo/libjpeg-turbo.changes 2011-11-21 12:35:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libjpeg-turbo.new/libjpeg-turbo.changes 2012-07-24 22:44:08.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Jul 23 11:33:56 UTC 2012 - pgajdos(a)suse.com + +- Update to version 1.2.1: + * fixed heap overflow [bnc#771791] + +------------------------------------------------------------------- +Thu Mar 22 13:25:09 UTC 2012 - idonmez(a)suse.com + +- Update to version 1.2.0 + * Fixed out-of-bounds read in SSE2 SIMD code + * Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can + be used to check the version of libjpeg-turbo against which + an application was compiled. + * Added new RGBA/BGRA/ABGR/ARGB colorspace extension constants + * libjpeg-turbo will now correctly decompress erroneous + CMYK/YCCK JPEGs whose K component is assigned a component ID + of 1 instead of 4. + * Added SIMD routines for RGB-to-grayscale color conversion + * Improved the performance of the C color conversion routines + * Added a function to the TurboJPEG API that performs lossless + transforms. + * Added support for 4:4:0 (transposed 4:2:2) subsampling + +------------------------------------------------------------------- Old: ---- libjpeg-turbo-1.1.1-int32.patch libjpeg-turbo-1.1.1-tiff-ojpeg.patch libjpeg-turbo-1.1.1.tar.bz2 New: ---- libjpeg-turbo-1.2.1-int32.patch libjpeg-turbo-1.2.1-tiff-ojpeg.patch libjpeg-turbo-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.DYqH9O/_old 2012-07-24 22:44:10.000000000 +0200 +++ /var/tmp/diff_new_pack.DYqH9O/_new 2012-07-24 22:44:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libjpeg-turbo # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define major 62 +%define major 8 %define minor 0 -%define micro 0 -%define srcver 1.1.1 +%define micro 2 +%define srcver 1.2.1 %define libver %{major}.%{minor}.%{micro} # major number of library from jpeg8 %define cmajor 8 Name: libjpeg-turbo -License: BSD-3-Clause -Group: Productivity/Graphics/Convertors Version: %{srcver} -Release: 1 +Release: 0 Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files +License: BSD-3-Clause +Group: Productivity/Graphics/Convertors Url: http://sourceforge.net/projects/libjpeg-turbo -BuildRequires: gcc-c++ libtool nasm -Provides: jpeg = %{version} -Obsoletes: jpeg -Conflicts: jpeg%{major} -Source0: %{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{versi… Source1: baselibs.conf Patch0: %{name}-%{version}-int32.patch Patch1: %{name}-%{version}-tiff-ojpeg.patch Patch2: libjpeg-ocloexec.patch +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: yasm +Provides: jpeg = %{version} +Obsoletes: jpeg < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: jpeg%{major} %description The libjpeg-turbo package contains a library of functions for manipulating @@ -49,18 +50,16 @@ %package -n libjpeg%{major} -License: BSD-3-Clause -Summary: The MMX/SSE accelerated JPEG compression/decompression library Version: %{libver} - - -Provides: libjpeg6 = %{version} -Obsoletes: libjpeg6 +Release: 0 +Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries -AutoReqProv: on + +Provides: libjpeg%{major} = %{version} +Obsoletes: libjpeg%{major} < %{version} # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-64bit +Obsoletes: libjpeg-64bit < %{version} %endif # @@ -68,36 +67,27 @@ This library contains MMX/SSE accelerated functions for manipulating JPEG images. - -Authors: --------- - Rob Hooft <hooft(a)EMBL-Heidelberg.DE> - Michael Mauldin <mlm(a)cs.cmu.edu> - %package -n libjpeg%{major}-devel -License: BSD-3-Clause -Summary: Development Tools for applications which will use the Libjpeg Library Version: %{libver} - - +Release: 0 +Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ + Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} -Obsoletes: libjpeg-devel +Obsoletes: libjpeg-devel < %{version} Conflicts: libjpeg%{cmajor}-devel # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-devel-64bit +Obsoletes: libjpeg-devel-64bit < %{version} %endif # -%description -n libjpeg62-devel +%description -n libjpeg%{major}-devel The libjpeg-devel package includes the header files and libraries necessary for compiling and linking programs which will manipulate JPEG files using the libjpeg library. - - %prep %setup -q %patch0 @@ -106,25 +96,29 @@ %build autoreconf -fiv -%configure --disable-static +%configure --disable-static \ + --with-jpeg8 make %{?_smp_mflags} %check make test libdir=%{_libdir} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall + # Fix perms -chmod -x README-turbo.txt +chmod -x README-turbo.txt release/copyright + # Remove unwanted files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib{,turbo}jpeg.la +rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la + # Don't distribute libjpegturbo because it is unversioned -rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h -rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so -rm $RPM_BUILD_ROOT%{_bindir}/jpgtest +rm %{buildroot}%{_includedir}/turbojpeg.h +rm %{buildroot}%{_libdir}/libturbojpeg.so +rm %{buildroot}%{_bindir}/tjbench -%clean -rm -rf $RPM_BUILD_ROOT +# Remove docs, we'll select docs manually +rm -rf %{buildroot}%{_datadir}/doc/ %post -n libjpeg%{major} -p /sbin/ldconfig @@ -132,9 +126,9 @@ %files %defattr(-,root,root) -%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt -%doc LICENSE.txt usage.txt wizard.txt -/usr/bin/* +%doc README README-turbo.txt change.log ChangeLog.txt +%doc release/copyright usage.txt wizard.txt +%{_bindir}/* %doc %{_mandir}/man1/* %files -n libjpeg%{major} @@ -144,7 +138,7 @@ %files -n libjpeg%{major}-devel %defattr(-,root,root) -/usr/include/*.h +%{_includedir}/*.h %{_libdir}/libjpeg.so %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.DYqH9O/_old 2012-07-24 22:44:10.000000000 +0200 +++ /var/tmp/diff_new_pack.DYqH9O/_new 2012-07-24 22:44:10.000000000 +0200 @@ -1,2 +1,2 @@ -libjpeg62 -libjpeg62-devel +libjpeg8 +libjpeg8-devel ++++++ libjpeg-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.DYqH9O/_old 2012-07-24 22:44:10.000000000 +0200 +++ /var/tmp/diff_new_pack.DYqH9O/_new 2012-07-24 22:44:10.000000000 +0200 @@ -83,12 +83,21 @@ } --- bmp.c.orig +++ bmp.c -@@ -257,7 +257,7 @@ int saveppm(char *filename, unsigned cha - FILE *fs=NULL; int retcode=0; - unsigned char *tempbuf=NULL; +@@ -112,7 +112,7 @@ int loadbmp(char *filename, unsigned cha + if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF) + _throw("loadbmp(): Invalid argument"); -- if((fs=fopen(filename, "wb"))==NULL) _throw(strerror(errno)); -+ if((fs=fopen(filename, "wbe"))==NULL) _throw(strerror(errno)); - if(fprintf(fs, "P6\n")<1) _throw("Write error"); - if(fprintf(fs, "%d %d\n", w, h)<1) _throw("Write error"); - if(fprintf(fs, "255\n")<1) _throw("Write error"); +- if((file=fopen(filename, "rb"))==NULL) ++ if((file=fopen(filename, READ_BINARY))==NULL) + _throwunix("loadbmp(): Cannot open input file"); + + cinfo.err=jpeg_std_error(&jerr.pub); +@@ -196,7 +196,7 @@ int savebmp(char *filename, unsigned cha + if(!filename || !buf || w<1 || h<1 || srcpf<0 || srcpf>=TJ_NUMPF) + _throw("savebmp(): Invalid argument"); + +- if((file=fopen(filename, "wb"))==NULL) ++ if((file=fopen(filename, WRITE_BINARY))==NULL) + _throwunix("savebmp(): Cannot open output file"); + + dinfo.err=jpeg_std_error(&jerr.pub); ++++++ libjpeg-turbo-1.1.1-int32.patch -> libjpeg-turbo-1.2.1-int32.patch ++++++ ++++++ libjpeg-turbo-1.1.1-tiff-ojpeg.patch -> libjpeg-turbo-1.2.1-tiff-ojpeg.patch ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit siproxd for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package siproxd for openSUSE:Factory checked in at 2012-07-24 22:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/siproxd (Old) and /work/SRC/openSUSE:Factory/.siproxd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "siproxd", Maintainer is "ro(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/siproxd/siproxd.changes 2012-07-12 10:53:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.siproxd.new/siproxd.changes 2012-07-24 22:43:33.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 24 07:48:24 UTC 2012 - werner(a)suse.de + +- Add missing font + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ siproxd.spec ++++++ --- /var/tmp/diff_new_pack.nnwxQs/_old 2012-07-24 22:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.nnwxQs/_new 2012-07-24 22:43:34.000000000 +0200 @@ -53,6 +53,7 @@ %if %suse_version > 1220 BuildRequires: texlive-courier BuildRequires: texlive-dvips +BuildRequires: texlive-ec BuildRequires: texlive-helvetic BuildRequires: texlive-jadetex BuildRequires: texlive-times -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0