June 2011 - openSUSE Commits - openSUSE Mailing Lists

commit linux-glibc-devel for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package linux-glibc-devel for openSUSE:Factory checked in at Thu Jun 30 16:29:02 CEST 2011. -------- --- linux-glibc-devel/linux-glibc-devel.changes 2010-11-16 17:29:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/linux-glibc-devel/linux-glibc-devel.changes 2011-06-29 10:20:44.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 29 07:51:04 UTC 2011 - aj(a)suse.de + +- Update kernel headers to 3.0 (from 3.0-rc5). +- Remove linux-glibc-devel.SuSE.TIOCGDEV.patch since it's upstream + now. +- Fix obsoletes. +- Use fdupes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linux-glibc-devel-2.6.36.tar.bz2 linux-glibc-devel.SuSE.TIOCGDEV.patch New: ---- linux-glibc-devel-3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-glibc-devel.spec ++++++ --- /var/tmp/diff_new_pack.Z1wkxy/_old 2011-06-30 16:27:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Z1wkxy/_new 2011-06-30 16:27:00.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package linux-glibc-devel (Version 2.6.36) +# spec file for package linux-glibc-devel # -# Copyright (c) 2010 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 @@ -17,6 +17,7 @@ # norootforbuild +BuildRequires: fdupes Name: linux-glibc-devel License: GPLv2 @@ -24,17 +25,16 @@ Group: Development/Libraries/C and C++ BuildArch: noarch # this confusing version number has no meaning -Version: 2.6.36 +Version: 3.0 Release: 1 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kernel-headers Provides: linux-kernel-headers = %{version} -Obsoletes: linux-kernel-headers <= %{version} +Obsoletes: linux-kernel-headers < %{version} PreReq: coreutils Source: %{name}-%{version}.tar.bz2 Source1: install_all.sh -Patch0: linux-glibc-devel.SuSE.TIOCGDEV.patch Patch1: linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch %description @@ -48,7 +48,6 @@ %prep %setup -q -%patch0 %patch1 %build @@ -87,7 +86,7 @@ #error "=======================================================" #else #define UTS_RELEASE "%{version}" -#define LINUX_VERSION_CODE `bash -c 'v="%{version}";read a b c d <<< "${v//./ }";echo "$(( (($a) << 16) + (($b) << 8) + ($c) ))"'` +#define LINUX_VERSION_CODE `bash -c 'v="%{version}";c=0;read a b <<< "${v//./ }";echo "$(( (($a) << 16) + (($b) << 8) + ($c) ))"'` #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #endif BOGUS @@ -110,9 +109,10 @@ # The directory turned into a symlink in 10.3 (2.6.22) # rpm will remove obsolete files after the post install scripts # A trigger will run after the /usr/include/asm was removed -# Create a dummy symlink now for rpmlint happiness, we %ghost this and create -# a proper symlink during %post: +# Create a dummy symlink now for rpmlint happiness, we %%ghost this and create +# a proper symlink during %%post: ln -sfn asm-dummy $RPM_BUILD_ROOT/usr/include/asm +%fdupes $RPM_BUILD_ROOT/usr/include %postun if test "$1" = 0 ++++++ install_all.sh ++++++ --- /var/tmp/diff_new_pack.Z1wkxy/_old 2011-06-30 16:27:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Z1wkxy/_new 2011-06-30 16:27:00.000000000 +0200 @@ -27,6 +27,8 @@ tar -xf $1 pushd linux-${kernel_dir} cp Makefile $header_dir +# header export for unicore32 in 2.6.39 is broken, disable it +sed -i -e 's/cris/cris\|unicore32/' scripts/headers.sh /usr/bin/make O="$header_dir" headers_install_all # kvm.h and aout.h are only installed if SRCARCH is an architecture # that has support for them. As the package is noarch we need to make @@ -50,6 +52,7 @@ sh64 \ v850 \ xtensa \ + unicore32 \ ; do rm -rf usr/include/asm-$asm done @@ -78,4 +81,5 @@ popd du -sh "$header_dir/usr" tar -cjf "$header_dir.tar.bz2" "${header_dir##*/}" -rm -rf $header_dir +rm -rf $header_dir linux-${kernel_dir} + ++++++ linux-glibc-devel-2.6.36.tar.bz2 -> linux-glibc-devel-3.0.tar.bz2 ++++++ ++++ 16105 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-nautilus for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package python-nautilus for openSUSE:Factory checked in at Thu Jun 30 16:26:46 CEST 2011. -------- --- GNOME/python-nautilus/python-nautilus.changes 2011-05-28 01:36:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-nautilus/python-nautilus.changes 2011-06-22 16:22:40.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jun 22 14:20:50 UTC 2011 - malcolmlewis(a)opensuse.org + +- Fix /usr/share/nautilus-python directories not owned by a + package. +- Update spec file Licence field from GPLv2+ to GPL-2.0+ to + conform with spdx.org identifier. + +------------------------------------------------------------------- +Fri Jun 17 04:19:57 CEST 2011 - vuntz(a)opensuse.org + +- Add python-nautilus-fix-path-in-pc.patch to fix the pkg-config + file to refer to the right extension directory, now that it + changed. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- python-nautilus-fix-path-in-pc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nautilus.spec ++++++ --- /var/tmp/diff_new_pack.CmtFOM/_old 2011-06-30 16:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CmtFOM/_new 2011-06-30 16:24:55.000000000 +0200 @@ -20,12 +20,14 @@ Name: python-nautilus %define _name nautilus-python Version: 1.0 -Release: 1 -License: GPLv2+ +Release: 3 +License: GPL-2.0+ Summary: Python bindings for Nautilus Group: Development/Libraries/Python Url: http://git.gnome.org/cgit/nautilus-python/ Source: %{_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM python-nautilus-fix-path-in-pc.patch bgo#652032 vuntz(a)opensuse.org -- Fix extension dir in pkg-config file +Patch0: python-nautilus-fix-path-in-pc.patch BuildRequires: gtk-doc BuildRequires: python-devel BuildRequires: pkgconfig(libnautilus-extension) @@ -39,7 +41,7 @@ so that Nautilus functionality can be easily extended. %package devel -License: GPLv2+ +License: GPL-2.0+ Summary: Python bindings for Nautilus - Development Files Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -52,6 +54,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build %configure --disable-static \ @@ -73,6 +76,7 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/nautilus/extensions-3.0/libnautilus-python.so +%dir %{_datadir}/nautilus-python %dir %{_datadir}/nautilus-python/extensions %files devel ++++++ python-nautilus-fix-path-in-pc.patch ++++++ Index: nautilus-python-1.0/nautilus-python.pc.in =================================================================== --- nautilus-python-1.0.orig/nautilus-python.pc.in +++ nautilus-python-1.0/nautilus-python.pc.in @@ -4,4 +4,4 @@ Version: @VERSION@ prefix=@prefix@ libdir=${prefix}/lib -pythondir=@NAUTILUS_EXTENSION_DIR@/python +pythondir=@datadir@/nautilus-python/extensions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit trousers for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package trousers for openSUSE:Factory checked in at Thu Jun 30 16:24:38 CEST 2011. -------- --- trousers/trousers.changes 2010-09-27 01:39:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/trousers/trousers.changes 2011-06-20 12:00:55.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 20 11:57:28 CEST 2011 - meissner(a)suse.de + +- Updated to TROUSERS_0_3_7 + - bugfixes + - obj_policy_is_secret_set added + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- trousers-0.3.6.diff trousers-0.3.6.tar.bz2 New: ---- trousers-0.3.7.diff trousers-0.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trousers.spec ++++++ --- /var/tmp/diff_new_pack.Q9Gp07/_old 2011-06-30 16:24:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Q9Gp07/_new 2011-06-30 16:24:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package trousers (Version 0.3.6) +# spec file for package trousers # -# Copyright (c) 2010 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 @@ -23,8 +23,8 @@ License: Other uncritical OpenSource License Group: Productivity/Security AutoReqProv: on -Version: 0.3.6 -Release: 2 +Version: 0.3.7 +Release: 1 Summary: TSS (TCG Software Stack) access daemon for a TPM chip Source0: %name-%version.tar.bz2 Source1: tcsd.init ++++++ trousers-0.3.6.diff -> trousers-0.3.7.diff ++++++ ++++++ trousers-0.3.6.tar.bz2 -> trousers-0.3.7.tar.bz2 ++++++ ++++ 25824 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/configure.in new/trousers-0.3.7/configure.in --- old/trousers-0.3.6/configure.in 2010-07-08 22:35:18.000000000 +0200 +++ new/trousers-0.3.7/configure.in 2011-06-17 16:20:32.000000000 +0200 @@ -2,7 +2,7 @@ # configure.in for the trousers project # -AC_INIT(trousers, 0.3.6, trousers-tech(a)lists.sf.net) +AC_INIT(trousers, 0.3.7, trousers-tech(a)lists.sf.net) TSS_SPEC_MAJOR=1 TSS_SPEC_MINOR=2 @@ -351,6 +351,7 @@ AC_C_BIGENDIAN([AC_DEFINE(_BIG_ENDIAN, 1, [big-endian host])]) AC_CHECK_DECL(htole32, [AC_DEFINE(HTOLE_DEFINED, 1, [htole32 function is available])]) +AC_CHECK_HEADER(endian.h, [AC_DEFINE(HAVE_ENDIAN_H, 1, [endian.h header])]) AC_CHECK_HEADER(sys/byteorder.h, [AC_DEFINE(HAVE_BYTEORDER_H, 1, [sys/byteorder.h header])]) AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/include/obj_policy.h new/trousers-0.3.7/src/include/obj_policy.h --- old/trousers-0.3.6/src/include/obj_policy.h 2010-03-11 21:27:03.000000000 +0100 +++ new/trousers-0.3.7/src/include/obj_policy.h 2010-09-10 21:50:27.000000000 +0200 @@ -152,6 +152,7 @@ TSS_RESULT obj_policy_get_xsap_params(TSS_HPOLICY, TPM_COMMAND_CODE, TPM_ENTITY_TYPE *, UINT32 *, BYTE **, BYTE *, TSS_CALLBACK *, TSS_CALLBACK *, TSS_CALLBACK *, UINT32 *, TSS_BOOL); +TSS_RESULT obj_policy_is_secret_set(TSS_HPOLICY, TSS_BOOL *); #ifdef TSS_BUILD_DELEGATION TSS_RESULT obj_policy_set_delegation_type(TSS_HPOLICY, UINT32); TSS_RESULT obj_policy_get_delegation_type(TSS_HPOLICY, UINT32 *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tcs/ps/ps_utils.c new/trousers-0.3.7/src/tcs/ps/ps_utils.c --- old/trousers-0.3.6/src/tcs/ps/ps_utils.c 2010-06-30 17:15:00.000000000 +0200 +++ new/trousers-0.3.7/src/tcs/ps/ps_utils.c 2010-09-10 21:50:27.000000000 +0200 @@ -419,7 +419,7 @@ } tmp->pub_data_size = LE_16(tmp->pub_data_size); - //DBG_ASSERT(tmp->pub_data_size <= 2048 && tmp->pub_data_size > 0); + DBG_ASSERT(tmp->pub_data_size <= 2048 && tmp->pub_data_size > 0); /* blob size */ if ((rc = read_data(fd, &tmp->blob_size, sizeof(UINT16)))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tcs/rpc/tcstp/rpc_daa.c new/trousers-0.3.7/src/tcs/rpc/tcstp/rpc_daa.c --- old/trousers-0.3.6/src/tcs/rpc/tcstp/rpc_daa.c 2010-06-09 22:18:45.000000000 +0200 +++ new/trousers-0.3.7/src/tcs/rpc/tcstp/rpc_daa.c 2010-09-10 21:50:27.000000000 +0200 @@ -41,10 +41,9 @@ if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); - LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA); - if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); + LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA); if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); @@ -145,9 +144,9 @@ if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); - LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA); if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); + LogDebugFn("thread %ld hDAA %x", THREAD_ID, hDAA); if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm)) return TCSERR(TSS_E_INTERNAL_ERROR); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tcs/tcs_pbg.c new/trousers-0.3.7/src/tcs/tcs_pbg.c --- old/trousers-0.3.6/src/tcs/tcs_pbg.c 2010-06-14 01:39:18.000000000 +0200 +++ new/trousers-0.3.7/src/tcs/tcs_pbg.c 2010-09-10 21:50:27.000000000 +0200 @@ -916,6 +916,7 @@ tpm_rqu_build(TPM_COMMAND_CODE ordinal, UINT64 *outOffset, BYTE *out_blob, ...) { TSS_RESULT result = TSS_SUCCESS; + UINT64 blob_size; va_list ap; DBG_ASSERT(ordinal); @@ -1448,6 +1449,13 @@ TPM_AUTH *auth1 = va_arg(ap, TPM_AUTH *); va_end(ap); + blob_size = in_len1 + in_len2 + TPM_DIGEST_SIZE + sizeof(TPM_AUTH); + if (blob_size > TSS_TPM_TXBLOB_SIZE) { + result = TCSERR(TSS_E_BAD_PARAMETER); + LogError("Oversized input when building ordinal 0x%x", ordinal); + break; + } + if (!keySlot1 || !in_blob2 || !auth1) { result = TCSERR(TSS_E_INTERNAL_ERROR); LogError("Internal error for ordinal 0x%x", ordinal); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tcsd/svrside.c new/trousers-0.3.7/src/tcsd/svrside.c --- old/trousers-0.3.6/src/tcsd/svrside.c 2010-06-09 22:19:00.000000000 +0200 +++ new/trousers-0.3.7/src/tcsd/svrside.c 2010-09-10 21:50:27.000000000 +0200 @@ -43,6 +43,7 @@ struct tpm_properties tpm_metrics; static volatile int hup = 0, term = 0; extern char *optarg; +int sd; static void tcsd_shutdown(void) @@ -61,6 +62,7 @@ tcsd_signal_term(int signal) { term = 1; + close(sd); } void @@ -213,7 +215,7 @@ { struct sockaddr_in serv_addr, client_addr; TSS_RESULT result; - int sd, newsd, c, option_index = 0; + int newsd, c, option_index = 0; unsigned client_len; char *hostname = NULL; struct passwd *pwd; @@ -339,5 +341,6 @@ } while (term ==0); /* To close correctly, we must receive a SIGTERM */ + tcsd_shutdown(); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tcsd/tcsd_threads.c new/trousers-0.3.7/src/tcsd/tcsd_threads.c --- old/trousers-0.3.6/src/tcsd/tcsd_threads.c 2010-06-09 22:23:09.000000000 +0200 +++ new/trousers-0.3.7/src/tcsd/tcsd_threads.c 2010-09-10 21:50:27.000000000 +0200 @@ -450,9 +450,8 @@ data->thread_id = THREAD_NULL; pthread_mutex_unlock(&(tm->lock)); pthread_exit(NULL); -#else - return NULL; #endif + return NULL; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/obj_policy.c new/trousers-0.3.7/src/tspi/obj_policy.c --- old/trousers-0.3.6/src/tspi/obj_policy.c 2010-03-11 21:27:03.000000000 +0100 +++ new/trousers-0.3.7/src/tspi/obj_policy.c 2010-09-10 21:50:27.000000000 +0200 @@ -302,6 +302,25 @@ } TSS_RESULT +obj_policy_is_secret_set(TSS_HPOLICY hPolicy, TSS_BOOL *secretSet) +{ + struct tsp_object *obj; + struct tr_policy_obj *policy; + TSS_RESULT result = TSS_SUCCESS; + + if ((obj = obj_list_get_obj(&policy_list, hPolicy)) == NULL) + return TSPERR(TSS_E_INVALID_HANDLE); + + policy = (struct tr_policy_obj *)obj->data; + + *secretSet = policy->SecretSet; + obj_list_put(&policy_list); + + return result; +} + + +TSS_RESULT obj_policy_set_secret(TSS_HPOLICY hPolicy, TSS_FLAG mode, UINT32 size, BYTE *data) { TCPA_DIGEST digest; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/ps/tspps.c new/trousers-0.3.7/src/tspi/ps/tspps.c --- old/trousers-0.3.6/src/tspi/ps/tspps.c 2010-05-02 04:39:11.000000000 +0200 +++ new/trousers-0.3.7/src/tspi/ps/tspps.c 2010-09-10 21:50:27.000000000 +0200 @@ -48,17 +48,7 @@ #if (defined (__FreeBSD__) || defined (__OpenBSD__)) static MUTEX_DECLARE_INIT(user_ps_path); #endif -#if defined (SOLARIS) -static struct flock fl = { - 0, - 0, - 0, - 0, - 0, - 0, - {0, 0, 0, 0} -}; -#endif +static struct flock fl; /* @@ -164,7 +154,7 @@ TSS_USER_PS_FILE); #endif if (rc == sizeof (buf)) { - LogDebugFn("USER PS: Path to file too long! (> %d bytes)", sizeof (buf)); + LogDebugFn("USER PS: Path to file too long! (> %zd bytes)", sizeof (buf)); } else *file = strdup(buf); @@ -185,12 +175,8 @@ /* check the global file handle first. If it exists, lock it and return */ if (user_ps_fd != -1) { -#if defined (SOLARIS) fl.l_type = F_WRLCK; if ((rc = fcntl(user_ps_fd, F_SETLKW, &fl))) { -#else - if ((rc = flock(user_ps_fd, LOCK_EX))) { -#endif /* SOLARIS */ LogDebug("USER PS: failed to lock file: %s", strerror(errno)); MUTEX_UNLOCK(user_ps_lock); return TSPERR(TSS_E_INTERNAL_ERROR); @@ -213,12 +199,8 @@ MUTEX_UNLOCK(user_ps_lock); return TSPERR(TSS_E_INTERNAL_ERROR); } -#if defined (SOLARIS) fl.l_type = F_WRLCK; if ((rc = fcntl(user_ps_fd, F_SETLKW, &fl))) { -#else - if ((rc = flock(user_ps_fd, LOCK_EX))) { -#endif /* SOLARIS */ LogDebug("USER PS: failed to get lock of %s: %s", file_name, strerror(errno)); free(file_name); close(user_ps_fd); @@ -240,12 +222,8 @@ fsync(fd); /* release the file lock */ -#if defined (SOLARIS) fl.l_type = F_UNLCK; if ((rc = fcntl(fd, F_SETLKW, &fl))) { -#else - if ((rc = flock(fd, LOCK_UN))) { -#endif /* SOLARIS */ LogDebug("USER PS: failed to unlock file: %s", strerror(errno)); rc = -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/tsp_auth.c new/trousers-0.3.7/src/tspi/tsp_auth.c --- old/trousers-0.3.6/src/tspi/tsp_auth.c 2010-03-11 21:36:19.000000000 +0100 +++ new/trousers-0.3.7/src/tspi/tsp_auth.c 2010-09-10 21:50:27.000000000 +0200 @@ -774,7 +774,7 @@ struct authsess **xsess) { TSS_RESULT result; - TSS_BOOL authdatausage = FALSE, req_auth = TRUE, get_child_auth = TRUE; + TSS_BOOL authdatausage = FALSE, req_auth = TRUE, get_child_auth = TRUE, secret_set = FALSE; BYTE hmacBlob[2 * sizeof(TPM_DIGEST)]; UINT64 offset; TSS_BOOL new_secret = TR_SECRET_CTX_NOT_NEW; @@ -921,7 +921,10 @@ goto error; } - if (!sess->hUsageChild) { + if ((result = obj_policy_is_secret_set(sess->hUsageChild, &secret_set))) + goto error; + + if (!secret_set) { result = TSPERR(TSS_E_TSP_AUTHREQUIRED); goto error; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/tspi_context.c new/trousers-0.3.7/src/tspi/tspi_context.c --- old/trousers-0.3.6/src/tspi/tspi_context.c 2010-01-28 17:27:51.000000000 +0100 +++ new/trousers-0.3.7/src/tspi/tspi_context.c 2011-02-21 17:24:44.000000000 +0100 @@ -55,6 +55,8 @@ /* Destroy all objects */ obj_close_context(tspContext); + Tspi_Context_FreeMemory(tspContext, NULL); + /* close the ps file */ PS_close(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/tspi_nv.c new/trousers-0.3.7/src/tspi/tspi_nv.c --- old/trousers-0.3.6/src/tspi/tspi_nv.c 2010-05-02 04:39:11.000000000 +0200 +++ new/trousers-0.3.7/src/tspi/tspi_nv.c 2011-02-21 14:46:27.000000000 +0100 @@ -130,9 +130,12 @@ free_tspi(tspContext, pWritePCR); if ((result = authsess_xsap_init(tspContext, hTpm, hNvstore, need_authdata, - TPM_ORD_NV_DefineSpace, TPM_ET_OWNER, &xsap))) + TPM_ORD_NV_DefineSpace, TPM_ET_OWNER, &xsap))) { + if (result == TSPERR(TSS_E_TSP_AUTHREQUIRED)) + result = TSS_ERROR_CODE(TSS_E_BAD_PARAMETER); return result; - + } + result = Trspi_HashInit(&hashCtx, TSS_HASH_SHA1); result |= Trspi_Hash_UINT32(&hashCtx, TPM_ORD_NV_DefineSpace); result |= Trspi_HashUpdate(&hashCtx, NVPublic_DataSize, NVPublicData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/src/tspi/tspi_ps.c new/trousers-0.3.7/src/tspi/tspi_ps.c --- old/trousers-0.3.6/src/tspi/tspi_ps.c 2010-05-03 00:40:25.000000000 +0200 +++ new/trousers-0.3.7/src/tspi/tspi_ps.c 2011-05-17 19:10:43.000000000 +0200 @@ -42,6 +42,8 @@ TCS_KEY_HANDLE tcsKeyHandle; TSS_HKEY parentTspHandle; TCS_LOADKEY_INFO info; + UINT32 ulPubKeyLength; + BYTE *rgbPubKey; if (phKey == NULL) return TSPERR(TSS_E_BAD_PARAMETER); @@ -91,6 +93,19 @@ if ((result = obj_rsakey_add(tspContext, TSS_RSAKEY_FLAG_OWNEREVICT, phKey))) return result; + if ((result = obj_rsakey_set_tcs_handle(*phKey, tcsKeyHandle))) + return result; + + //The cached public key portion of the owner evict key is used + //further by TPM_KEY_CONTROLOWNER command for sanity check + if ((result = Tspi_Key_GetPubKey(*phKey, &ulPubKeyLength, &rgbPubKey))) + return result; + + result = obj_rsakey_set_pubkey(*phKey, FALSE, rgbPubKey); + + free(rgbPubKey); + if (result != TSS_SUCCESS) + return result; } else { if ((result = RPC_GetRegisteredKeyBlob(tspContext, uuidData, &keyBlobSize, &keyBlob))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/trousers-0.3.6/tools/ps_inspect.c new/trousers-0.3.7/tools/ps_inspect.c --- old/trousers-0.3.6/tools/ps_inspect.c 2010-06-30 17:51:32.000000000 +0200 +++ new/trousers-0.3.7/tools/ps_inspect.c 2011-02-21 14:46:27.000000000 +0100 @@ -186,7 +186,7 @@ { int rc, members = 0; UINT32 i; - UINT32 *u32 = (UINT32 *) buf; + UINT32 *u32 = (UINT32 *) &buf; PRINT("version: 0\n"); PRINT("number of keys: %u\n", *u32); @@ -273,11 +273,11 @@ int bad_file_size(UINT32 num_keys, off_t file_size) { - //if ((num_keys * 360) < (unsigned long)file_size) - // return 1; + if ((num_keys * 360) > (unsigned long)file_size) + return 1; - //if ((num_keys * 560) > (unsigned long)file_size) - // return 1; + if ((num_keys * 560) < (unsigned long)file_size) + return 1; return 0; } @@ -298,7 +298,6 @@ } if (buf[0] == '\1') { - printf("lala %d\n", (int) file_size); num_keys = (UINT32 *)&buf[1]; if (*num_keys == 0 || bad_file_size(*num_keys, file_size)) goto version0; @@ -307,9 +306,9 @@ } version0: - num_keys = (UINT32 *)&buf[1]; + num_keys = (UINT32 *)&buf[0]; if (*num_keys == 0 || bad_file_size(*num_keys, file_size)) { - printf("This file does not appear to be a valid PS file. %d\n", (int) *(num_keys)); + printf("This file does not appear to be a valid PS file.\n"); return -1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibc for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at Thu Jun 30 14:59:50 CEST 2011. -------- --- glibc/glibc.changes 2011-06-28 14:51:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2011-06-30 13:28:06.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 30 11:22:02 UTC 2011 - aj(a)suse.de + +- Back to kernel 2.6.16 as minimal kernel version. + +------------------------------------------------------------------- @@ -4,2 +9 @@ -- Only apply glibc-2.10.99-ia64-include.diff on SLE but not on - openSUSE. +- Only apply glibc-statfs64-ia64.diff on SLE but not on openSUSE. calling whatdependson for head-i586 Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.oY3AJq/_old 2011-06-30 14:58:52.000000000 +0200 +++ /var/tmp/diff_new_pack.oY3AJq/_new 2011-06-30 14:58:52.000000000 +0200 @@ -52,11 +52,9 @@ %define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_cell 0 %endif # ppc, ppc64 -%ifarch %ix86 x86_64 -%define enablekernel 2.6.32 -%else -%define enablekernel 2.6.5 -%endif +# 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel +# since many SUSE build machines have it +%define enablekernel 2.6.16 %ifarch ppc ppc64 # On PowerPC we got a memory corruption during building, disabling # exp_malloc fixed it. Disable it until we have found and fixed the @@ -79,7 +77,7 @@ Obsoletes: glibc-32bit %endif Version: 2.13 -Release: 17 +Release: 19 Url: http://www.gnu.org/software/libc/libc.html Source: glibc-%{version}-996cf2ef0727.tar.bz2 Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zlib for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at Thu Jun 30 14:14:41 CEST 2011. -------- --- zlib/zlib.changes 2011-05-30 21:39:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/zlib/zlib.changes 2011-06-27 13:07:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 27 11:05:47 UTC 2011 - dimstar(a)opensuse.org + +- bnc#652333: Change LICENSE text to not have version, which + changes too often and invalidates the text everytime. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.myFoUA/_old 2011-06-30 14:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.myFoUA/_new 2011-06-30 14:14:24.000000000 +0200 @@ -28,7 +28,7 @@ %endif # Version: 1.2.5_git201105272030 -Release: 1 +Release: 15 Summary: Data Compression Library Url: http://www.zlib.net/ # git://github.com/kaffeemonster/zlib_adler32_vec.git ++++++ LICENSE ++++++ --- /var/tmp/diff_new_pack.myFoUA/_old 2011-06-30 14:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.myFoUA/_new 2011-06-30 14:14:24.000000000 +0200 @@ -1,11 +1,11 @@ The zlib library itself is released under specific zlib license see zlib.h in tarball -However files -zlib-1.2.3/contrib/asm586/match.S -zlib-1.2.3/contrib/masm686/match.asm -zlib-1.2.3/contrib/masmx86/gvmat32.asm -zlib-1.2.3/contrib/ada/zlib.ads +However files (relative to extracted source tarballs root) + contrib/asm586/match.S + contrib/masm686/match.asm + contrib/masmx86/gvmat32.asm + contrib/ada/zlib.ads which are not used to build zlib library, but are shipped in source of zlib are release under the GNU General Public License, see the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevplatform for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Thu Jun 30 14:12:12 CEST 2011. -------- --- KDE/kdevplatform/kdevplatform.changes 2011-04-28 15:58:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2011-06-29 23:43:49.000000000 +0200 @@ -1,0 +2,31 @@ +Wed Jun 29 21:37:48 UTC 2011 - javier(a)opensuse.org + +- update to 1.2.3 + * Make declarations from macros get appended instead of + prepended. + * make sure we don't crash on (broken?) declarations without + internal context in create class wizard + * Fix black scrollbars in context browser views. + * step into/over instruction did the wrong thing + * Fix more clang build errors. + * In AppendedList, qualify call to KDevVarLengthArray::append + with 'this'. + * calling PTHREAD_MUTEX_INITIALIZER is not nessary because + pthread_mutex_init() does the work, also it causes compile + error on some systems (cherry picked from commit + 7d8c4d89b981680b77d547c7a2e2b64a56b2b098) + * try to protect against crash triggered by nested event loops + and failing svn jobs + * fix: left-hand operand of comma has no effect + * remove IRequired=IStatus from grepview + +------------------------------------------------------------------- +Fri Jun 24 18:06:32 UTC 2011 - javier(a)opensuse.org + +- update to 1.2.2 + * Fix crash when kate (or other editor) is not found + * prevent assert in outdated annotation line + * connect to proper signal + * Remove 'mutable' from reference variables. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevplatform-1.2.0-gcc46.patch kdevplatform-1.2.0.tar.bz2 New: ---- kdevplatform-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.ZxZXO0/_old 2011-06-30 14:10:40.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxZXO0/_new 2011-06-30 14:10:40.000000000 +0200 @@ -29,11 +29,10 @@ Group: Development/Tools/IDE Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org -Version: 1.2.0 -Release: 5 +Version: 1.2.3 +Release: 1 Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM kdevplatform-1.2.0-gcc46.patch idoenmez(a)suse.de -- Fix gcc 4.6 compilation, bko#267833 -Patch1: kdevplatform-1.2.0-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: libkdevplatform0 = %{version} @@ -64,7 +63,6 @@ %lang_package %prep %setup -q -%patch1 -p1 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt ++++++ kdevplatform-1.2.0.tar.bz2 -> kdevplatform-1.2.3.tar.bz2 ++++++ ++++ 99616 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pdf2svg for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package pdf2svg for openSUSE:Factory checked in at Thu Jun 30 13:40:03 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/pdf2svg/pdf2svg.changes 2011-03-22 15:33:20.000000000 +0100 @@ -0,0 +1,4 @@ +Tue Mar 22 14:31:31 UTC 2011 - dmitry(a)roshchin.org + +- initial package +- version 0.2.1 \ No newline at end of file calling whatdependson for head-i586 New: ---- pdf2svg-0.2.1.tar.gz pdf2svg.changes pdf2svg.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdf2svg.spec ++++++ # # spec file for package pdf2svg # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: pdf2svg Url: http://www.cityinthesky.co.uk/pdf2svg.html License: GPLv2+ Group: Productivity/Graphics/Convertors Summary: PDF to SVG Converter Version: 0.2.1 Release: 1 Source0: %name-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libpoppler-glib-devel BuildRequires: cairo-devel %description A small tool to convert PDF files into SVG using poppler and cairo. Authors: David Barton <davebarton at cityinthesky dot co.uk> Matthew Flaschen <matthew.flaschen at gatech dot edu> Edward Grace <ej.grace at imperial dot ac.uk> %prep %setup -q %build configure --prefix=/usr/ make %{?_smp_mflags} %install %makeinstall %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/%{name} %doc README AUTHORS ChangeLog %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Thu Jun 30 13:21:41 CEST 2011. -------- --- hal/hal-doc.changes 2011-01-15 02:36:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal-doc.changes 2011-06-30 10:00:06.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 30 07:14:33 UTC 2011 - aj(a)suse.de + +- Fix building with newer kernel headers (hal-videodev.patch taken + from hal git). + +------------------------------------------------------------------- hal.changes: same change calling whatdependson for head-i586 New: ---- hal-videodev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.bfTeVI/_old 2011-06-30 13:14:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bfTeVI/_new 2011-06-30 13:14:53.000000000 +0200 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 14 +Release: 15 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -70,6 +70,7 @@ Patch4: hal-nonpolkit-mount-policy.patch Patch5: hal-fix-docking.patch Patch6: hal-probe-input-segv.patch +Patch7: hal-videodev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -120,6 +121,7 @@ #patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 chmod 644 tools/hal-functions pushd hal-info-%{hal_info_version} popd ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.bfTeVI/_old 2011-06-30 13:14:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bfTeVI/_new 2011-06-30 13:14:53.000000000 +0200 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 14 +Release: 21 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -70,6 +70,7 @@ Patch4: hal-nonpolkit-mount-policy.patch Patch5: hal-fix-docking.patch Patch6: hal-probe-input-segv.patch +Patch7: hal-videodev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -120,6 +121,7 @@ #patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 chmod 644 tools/hal-functions pushd hal-info-%{hal_info_version} popd ++++++ hal-videodev.patch ++++++ commit ae13d96fa2a0612b6000f4b8f6ed9d3564035703 Author: Michael Biebl <biebl(a)debian.org> Date: Sun Apr 10 14:54:53 2011 +0200 Build hald-probe-video4linux on current kernels again The hald-probe-video4linux prober supports both v4l1 and v4l2. Support for v4l1 has been removed from Linux kernel 2.6.38. Instead of disabling the prober altogether, #ifdef the v4l1 parts when building on a newer kernel. Signed-off-by: Martin Pitt <martin.pitt(a)ubuntu.com> diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c index 7bc13e8..b055720 100644 --- a/hald/linux/probing/probe-video4linux.c +++ b/hald/linux/probing/probe-video4linux.c @@ -30,7 +30,9 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/ioctl.h> +#ifdef HAVE_LINUX_VIDEODEV_H #include <linux/videodev.h> +#endif #include <linux/videodev2.h> #include <errno.h> #include <fcntl.h> @@ -50,7 +52,9 @@ main (int argc, char *argv[]) int ret = -1; char *udi; char *device_file; +#ifdef HAVE_LINUX_VIDEODEV_H struct video_capability v1cap; +#endif struct v4l2_capability v2cap; LibHalContext *ctx = NULL; LibHalChangeSet *cset; @@ -107,7 +111,9 @@ main (int argc, char *argv[]) LIBHAL_FREE_DBUS_ERROR (&error); libhal_device_add_capability (ctx, udi, "video4linux.radio", &error); } - } else { + } +#ifdef HAVE_LINUX_VIDEODEV_H + else { HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed")); if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { @@ -134,6 +140,7 @@ main (int argc, char *argv[]) HAL_DEBUG (("ioctl VIDIOCGCAP failed")); } } +#endif LIBHAL_FREE_DBUS_ERROR (&error); libhal_device_commit_changeset (ctx, cset, &error); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit urfkill for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package urfkill for openSUSE:Factory checked in at Thu Jun 30 13:14:15 CEST 2011. -------- --- urfkill/urfkill.changes 2011-04-19 09:49:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/urfkill/urfkill.changes 2011-06-28 09:49:10.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 13 09:59:41 UTC 2011 - glin(a)novell.com + +- Version bump to 0.2.0 + New Features: + + All DBus methods, signals, and properties were revised and amended + + Support the individual key control settings for each user + + GObject introspection support in liburfkill-glib + + Documents for the daemon, the DBus interfaces, and liburfkill-glib + + Test cases for the daemon and liburkill-glib +- Enable gobject-introspection + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- urfkill-0.1.1.tar.bz2 New: ---- urfkill-0.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ urfkill.spec ++++++ --- /var/tmp/diff_new_pack.qR5w29/_old 2011-06-30 13:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.qR5w29/_new 2011-06-30 13:13:45.000000000 +0200 @@ -19,7 +19,7 @@ Name: urfkill -Version: 0.1.1 +Version: 0.2.0 Release: 1 Url: http://github.com/lcp/urfkill License: GPL v2 or later @@ -36,6 +36,7 @@ BuildRequires: dbus-1-glib-devel BuildRequires: polkit-devel BuildRequires: libexpat-devel +BuildRequires: gobject-introspection-devel Requires: polkit %description @@ -116,20 +117,25 @@ %files %defattr(-,root,root) +%doc AUTHORS COPYING NEWS README %dir %{_libexecdir}/urfkill %{_libexecdir}/urfkill/urfkilld %{_datadir}/dbus-1/system-services/*.service %{_datadir}/polkit-1/actions/org.freedesktop.*.policy +%doc %{_mandir}/man?/*.* %config %{_sysconfdir}/dbus-1/system.d/*.conf %config %{_sysconfdir}/urfkill %files -n liburfkill-glib0 %defattr(-,root,root) %{_libdir}/liburfkill-glib.so.* +%{_libdir}/girepository-1.0/Urfkill-*.typelib %files -n liburfkill-glib-devel %defattr(-,root,root) %{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/gir-1.0/Urfkill-*.gir +%doc %{_datadir}/gtk-doc/html/urfkill %{_includedir}/liburfkill-glib %{_libdir}/liburfkill-glib.so %{_libdir}/pkgconfig/urfkill-glib.pc ++++++ urfkill-0.1.1.tar.bz2 -> urfkill-0.2.0.tar.bz2 ++++++ ++++ 15592 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '11

30 Jun '11

Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Thu Jun 30 13:08:19 CEST 2011. -------- --- file/file.changes 2010-11-24 13:22:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file.changes 2011-06-14 19:53:45.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jun 14 19:50:04 CEST 2011 - werner(a)suse.de + +- Update to file version 5.07 + * Several regressions in magic were fixed. A buffer overflow was + corrected. The program version is now recorded in only one place. + Several documentation improvements were made. + * The Python bindings were updated and fixed. Magic support for + OCF (EPUB) files and for lrzip files was added. Zip file magic + was adapted for files with unsupported special types. Many + more magic updates and fixes were made. + * Several minor bugs were fixed. +- Add magic for clicfs evne if upstream does not support it (bnc#681329) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- file-4.16-python.dif file-4.21-reiserfs.dif file-4.24-elf.dif file-4.24-reg_dos.dif file-5.02-misc.dif file-5.02-option.dif file-5.03-iso9660.dif file-5.04-awk.dif file-5.04-biorad.dif file-5.04-exec.dif file-5.04-llvm.dif file-5.04-visibility.patch file-5.04-zip2.0.dif file-5.04.dif file-5.04.tar.bz2 New: ---- file-5.07-biorad.dif file-5.07-clicfs.dif file-5.07-elf.dif file-5.07-exec.dif file-5.07-iso9660.dif file-5.07-llvm.dif file-5.07-misc.dif file-5.07-option.dif file-5.07-visibility.patch file-5.07-zip2.0.dif file-5.07.dif file-5.07.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.sDlc74/_old 2011-06-30 12:56:18.000000000 +0200 +++ /var/tmp/diff_new_pack.sDlc74/_new 2011-06-30 12:56:18.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package file (Version 5.04) +# spec file for package file # -# Copyright (c) 2010 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 @@ -30,37 +30,34 @@ %endif # # Set Version also in python-magic.spec -Version: 5.04 -Release: 8 +Version: 5.07 +Release: 1 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Source2: baselibs.conf Patch: file-%{version}.dif -Patch1: file-5.02-misc.dif -Patch3: file-5.04-exec.dif +Patch1: file-5.07-misc.dif +Patch3: file-5.07-exec.dif Patch4: file-4.24-autoconf.dif Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif Patch8: file-4.20-xen.dif -Patch9: file-4.24-elf.dif +Patch9: file-5.07-elf.dif Patch10: file-4.18-printf.dif -Patch11: file-4.24-reg_dos.dif -Patch12: file-5.02-option.dif +Patch12: file-5.07-option.dif Patch13: file-4.21-scribus.dif -Patch14: file-5.04-awk.dif Patch15: file-4.21-xcursor.dif -Patch16: file-4.21-reiserfs.dif Patch20: file-4.24-mips.dif -Patch21: file-4.16-python.dif Patch22: file-4.24-cromfs.dif Patch24: file-4.24-warn.dif Patch25: file-5.02-javacheck.dif Patch26: file-4.24-solv.dif -Patch27: file-5.04-zip2.0.dif -Patch28: file-5.03-iso9660.dif -Patch29: file-5.04-llvm.dif -Patch30: file-5.04-visibility.patch -Patch31: file-5.04-biorad.dif +Patch27: file-5.07-zip2.0.dif +Patch28: file-5.07-iso9660.dif +Patch29: file-5.07-llvm.dif +Patch30: file-5.07-visibility.patch +Patch31: file-5.07-biorad.dif +Patch32: file-5.07-clicfs.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -107,18 +104,12 @@ %patch8 -p0 -b .xen %patch9 -p0 -b .elf %patch10 -p0 -b .prtf -%patch11 -p0 -b .reg %patch12 -p0 -b .opt %patch13 -p0 -b .scri -%patch14 -p0 -b .awk %patch15 -p0 -b .xcur -%patch16 -p0 -b .reiserfs %ifarch mips %patch20 -p0 -b .mips %endif -%if 0%{?build_python_bindings:1} -%patch21 -p0 -b .python -%endif %patch22 -p0 -b .cromfs %patch24 -p0 -b .warn %patch25 -p0 -b .javacheck @@ -128,6 +119,7 @@ %patch29 -p0 -b .llvm %patch30 -p0 -b .vis %patch31 -p0 -b .biorad +%patch32 -p0 -b .clicfs %patch %build ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.sDlc74/_old 2011-06-30 12:56:18.000000000 +0200 +++ /var/tmp/diff_new_pack.sDlc74/_new 2011-06-30 12:56:18.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-magic (Version 5.04) +# spec file for package python-magic # -# Copyright (c) 2010 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 @@ -26,8 +26,8 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on -Version: 5.04 -Release: 8 +Version: 5.07 +Release: 1 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-5.04-biorad.dif -> file-5.07-biorad.dif ++++++ --- file/file-5.04-biorad.dif 2010-11-24 13:22:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-biorad.dif 2011-06-14 19:53:35.000000000 +0200 @@ -1,26 +1,11 @@ --- magic/Magdir/images -+++ magic/Magdir/images 2010-11-24 12:11:01.520426341 +0000 -@@ -551,11 +551,18 @@ - # Bio-Rad .PIC is an image format used by microscope control systems - # and related image processing software used by biologists. - # From: Vebjorn Ljosa <vebjorn(a)ljosa.com> --54 leshort 12345 Bio-Rad .PIC Image File -->0 leshort >0 %hd x -->2 leshort >0 %hd, -->4 leshort =1 1 image in file -->4 leshort >1 %hd images in file -+# BOOL values are two-byte integers; use them to rule out false positives. -+# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/b… -+# Samples: http://www.loci.wisc.edu/software/sample-data -+14 leshort <2 ++++ magic/Magdir/images 2011-06-14 14:09:58.779926039 +0000 +@@ -583,6 +583,8 @@ + # http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/b… + # Samples: http://www.loci.wisc.edu/software/sample-data + 14 leshort <2 +>4 leshort >0 +>49 byte 0 -+>62 leshort <2 -+>>54 leshort 12345 Bio-Rad .PIC Image File -+>>>0 leshort >0 %hd x -+>>>2 leshort >0 %hd, -+>>>4 leshort =1 1 image in file -+>>>4 leshort >1 %hd images in file - - # From Jan "Yenya" Kasprzak <kas(a)fi.muni.cz> - # The description of *.mrw format can be found at + >62 leshort <2 + >>54 leshort 12345 Bio-Rad .PIC Image File + >>>0 leshort >0 %hd x ++++++ file-5.07-clicfs.dif ++++++ --- magic/Localstuff +++ magic/Localstuff 2011-06-14 17:40:22.417764753 +0000 @@ -53,3 +53,11 @@ 0 string SOLV Sat-solver solv file, >4 belong x version %ld + +# coolo's clicfs + +0 string/b CLIC ClicFS +>4 byte x \b Version %c +>5 byte x \b%c +>6 long >0 +>>6 pstring/l >0 \b, Target "%s" ++++++ file-4.24-elf.dif -> file-5.07-elf.dif ++++++ --- file/file-4.24-elf.dif 2008-04-14 19:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.07-elf.dif 2011-06-14 19:53:37.000000000 +0200 @@ -1,15 +1,15 @@ --- src/readelf.c -+++ src/readelf.c 2008-04-14 16:43:48.082574211 +0200 -@@ -663,7 +663,7 @@ core: ++++ src/readelf.c 2011-06-14 13:58:06.424425742 +0000 +@@ -678,7 +678,7 @@ core: default: - if (xnh_type == NT_PRPSINFO) { + if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { - size_t i, j; + size_t i, j, m = 0; unsigned char c; /* * Extract the program name. We assume -@@ -675,7 +675,9 @@ core: +@@ -690,7 +690,9 @@ core: * If the characters aren't all printable, * reject it. */ ++++++ file-5.04-exec.dif -> file-5.07-exec.dif ++++++ --- file/file-5.04-exec.dif 2010-02-05 17:16:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-exec.dif 2011-06-14 19:53:37.000000000 +0200 @@ -1,107 +1,105 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2010-02-05 14:28:46.657297767 +0000 -@@ -4,73 +4,73 @@ ++++ magic/Magdir/commands 2011-06-14 13:50:11.135927768 +0000 +@@ -4,71 +4,71 @@ # commands: file(1) magic for various shells and interpreters # - #0 string : shell archive or script for antique kernel text --0 string/w #!\ /bin/sh POSIX shell script text executable -+0 string/w #!\ /bin/sh POSIX shell script text + #0 string/w : shell archive or script for antique kernel text +-0 string/wt #!\ /bin/sh POSIX shell script text executable ++0 string/wt #!\ /bin/sh POSIX shell script text !:mime text/x-shellscript --0 string/w #!\ /bin/csh C shell script text executable -+0 string/w #!\ /bin/csh C shell script text +-0 string/wt #!\ /bin/csh C shell script text executable ++0 string/wt #!\ /bin/csh C shell script text !:mime text/x-shellscript # korn shell magic, sent by George Wu, gwu(a)clyde.att.com --0 string/w #!\ /bin/ksh Korn shell script text executable -+0 string/w #!\ /bin/ksh Korn shell script text +-0 string/wt #!\ /bin/ksh Korn shell script text executable ++0 string/wt #!\ /bin/ksh Korn shell script text !:mime text/x-shellscript --0 string/w #!\ /bin/tcsh Tenex C shell script text executable -+0 string/w #!\ /bin/tcsh Tenex C shell script text +-0 string/wt #!\ /bin/tcsh Tenex C shell script text executable ++0 string/wt #!\ /bin/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable -+0 string/w #!\ /usr/bin/tcsh Tenex C shell script text +-0 string/wt #!\ /usr/bin/tcsh Tenex C shell script text executable ++0 string/wt #!\ /usr/bin/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable -+0 string/w #!\ /usr/local/tcsh Tenex C shell script text +-0 string/wt #!\ /usr/local/tcsh Tenex C shell script text executable ++0 string/wt #!\ /usr/local/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable -+0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text +-0 string/wt #!\ /usr/local/bin/tcsh Tenex C shell script text executable ++0 string/wt #!\ /usr/local/bin/tcsh Tenex C shell script text !:mime text/x-shellscript # # zsh/ash/ae/nawk/gawk magic from cameron(a)cs.unsw.oz.au (Cameron Simpson) --0 string/w #!\ /bin/zsh Paul Falstad's zsh script text executable -+0 string/w #!\ /bin/zsh Paul Falstad's zsh script text +-0 string/wt #!\ /bin/zsh Paul Falstad's zsh script text executable ++0 string/wt #!\ /bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text executable -+0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text +-0 string/wt #!\ /usr/bin/zsh Paul Falstad's zsh script text executable ++0 string/wt #!\ /usr/bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable -+0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text +-0 string/wt #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable ++0 string/wt #!\ /usr/local/bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text executable -+0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text +-0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text executable ++0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text executable -+0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text +-0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text executable ++0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text !:mime text/x-shellscript --0 string/w #!\ /bin/nawk new awk script text executable -+0 string/w #!\ /bin/nawk new awk script text +-0 string/wt #!\ /bin/nawk new awk script text executable ++0 string/wt #!\ /bin/nawk new awk script text !:mime text/x-nawk --0 string/w #!\ /usr/bin/nawk new awk script text executable -+0 string/w #!\ /usr/bin/nawk new awk script text +-0 string/wt #!\ /usr/bin/nawk new awk script text executable ++0 string/wt #!\ /usr/bin/nawk new awk script text !:mime text/x-nawk --0 string/w #!\ /usr/local/bin/nawk new awk script text executable -+0 string/w #!\ /usr/local/bin/nawk new awk script text +-0 string/wt #!\ /usr/local/bin/nawk new awk script text executable ++0 string/wt #!\ /usr/local/bin/nawk new awk script text !:mime text/x-nawk --0 string/w #!\ /bin/gawk GNU awk script text executable -+0 string/w #!\ /bin/gawk GNU awk script text +-0 string/wt #!\ /bin/gawk GNU awk script text executable ++0 string/wt #!\ /bin/gawk GNU awk script text !:mime text/x-gawk --0 string/w #!\ /usr/bin/gawk GNU awk script text executable -+0 string/w #!\ /usr/bin/gawk GNU awk script text +-0 string/wt #!\ /usr/bin/gawk GNU awk script text executable ++0 string/wt #!\ /usr/bin/gawk GNU awk script text !:mime text/x-gawk --0 string/w #!\ /usr/local/bin/gawk GNU awk script text executable -+0 string/w #!\ /usr/local/bin/gawk GNU awk script text +-0 string/wt #!\ /usr/local/bin/gawk GNU awk script text executable ++0 string/wt #!\ /usr/local/bin/gawk GNU awk script text !:mime text/x-gawk # --0 string/w #!\ /bin/awk awk script text executable -+0 string/w #!\ /bin/awk awk script text +-0 string/wt #!\ /bin/awk awk script text executable ++0 string/wt #!\ /bin/awk awk script text !:mime text/x-awk --0 string/w #!\ /usr/bin/awk awk script text executable -+0 string/w #!\ /usr/bin/awk awk script text +-0 string/wt #!\ /usr/bin/awk awk script text executable ++0 string/wt #!\ /usr/bin/awk awk script text !:mime text/x-awk - # update to distinguish from *.vcf files - # this is broken because postscript has /EBEGIN{ for example. - #0 search/Ww BEGIN { awk script text + 0 regex =^\\s*BEGIN\\s*[{] awk script text # AT&T Bell Labs' Plan 9 shell --0 string/w #!\ /bin/rc Plan 9 rc shell script text executable -+0 string/w #!\ /bin/rc Plan 9 rc shell script text +-0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable ++0 string/wt #!\ /bin/rc Plan 9 rc shell script text # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) --0 string/w #!\ /bin/bash Bourne-Again shell script text executable -+0 string/w #!\ /bin/bash Bourne-Again shell script text +-0 string/wt #!\ /bin/bash Bourne-Again shell script text executable ++0 string/wt #!\ /bin/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable -+0 string/w #!\ /usr/bin/bash Bourne-Again shell script text +-0 string/wt #!\ /usr/bin/bash Bourne-Again shell script text executable ++0 string/wt #!\ /usr/bin/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable -+0 string/w #!\ /usr/local/bash Bourne-Again shell script text +-0 string/wt #!\ /usr/local/bash Bourne-Again shell script text executable ++0 string/wt #!\ /usr/local/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable -+0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text +-0 string/wt #!\ /usr/local/bin/bash Bourne-Again shell script text executable ++0 string/wt #!\ /usr/local/bin/bash Bourne-Again shell script text !:mime text/x-shellscript # using env - 0 string #!/usr/bin/env a -->15 string >\0 %s script text executable -+>15 string >\0 %s script text - 0 string #!\ /usr/bin/env a -->16 string >\0 %s script text executable -+>16 string >\0 %s script text + 0 string/t #!/usr/bin/env a +->15 string/t >\0 %s script text executable ++>15 string/t >\0 %s script text + 0 string/t #!\ /usr/bin/env a +->16 string/t >\0 %s script text executable ++>16 string/t >\0 %s script text # PHP scripts # Ulf Harnhammar <ulfh(a)update.uu.se> -@@ -80,9 +80,9 @@ +@@ -78,9 +78,9 @@ !:mime text/x-php 0 search/1 =<?\r PHP script text !:mime text/x-php @@ -111,8 +109,8 @@ -0 search/1/w #!\ /usr/bin/php PHP script text executable +0 search/1/w #!\ /usr/bin/php PHP script text !:mime text/x-php - - 0 string Zend\x00 PHP script Zend Optimizer data + # Smarty compiled template, http://www.smarty.net/ + # Elan Ruusamäe <glen(a)delfi.ee> --- magic/Magdir/perl +++ magic/Magdir/perl 2009-05-05 12:01:34.000000000 +0000 @@ -6,15 +6,15 @@ @@ -135,19 +133,19 @@ 0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text !:mime text/x-perl --- magic/Magdir/python -+++ magic/Magdir/python 2010-02-05 14:29:13.101297655 +0000 ++++ magic/Magdir/python 2011-06-14 13:51:01.507926101 +0000 @@ -5,7 +5,7 @@ # # From: David Necas <yeti(a)physics.muni.cz> # often the module starts with a multiline string --0 string """ a python script text executable -+0 string """ a python script text - # MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming +-0 string/t """ a python script text executable ++0 string/t """ a python script text + # MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming # that Py_UnicodeFlag is off for Python 2) # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" -@@ -20,11 +20,11 @@ - 0 belong 0x3b0c0d0a python 3.0 byte-compiled +@@ -22,39 +22,39 @@ 0 belong 0x4f0c0d0a python 3.1 byte-compiled + 0 belong 0x6c0c0d0a python 3.2 byte-compiled -0 search/1/w #!\ /usr/bin/python Python script text executable +0 search/1/w #!\ /usr/bin/python Python script text @@ -158,25 +156,59 @@ -0 search/1 #!/usr/bin/env\ python Python script text executable +0 search/1 #!/usr/bin/env\ python Python script text !:mime text/x-python --0 search/1 #!\ /usr/bin/env\ ruby Python script text executable -+0 search/1 #!\ /usr/bin/env\ ruby Python script text +-0 search/1 #!\ /usr/bin/env\ python Python script text executable ++0 search/1 #!\ /usr/bin/env\ python Python script text + !:mime text/x-python + + + # from module.submodule import func1, func2 +-0 regex \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text executable ++0 regex \^from\\s+(\\w|\\.)+\\s+import.*$ Python script text + !:mime text/x-python + + # def __init__ (self, ...): + 0 search/4096 def\ __init__ +->&0 search/64 self Python script text executable ++>&0 search/64 self Python script text + !:mime text/x-python + + # comments + 0 search/4096 ''' +->&0 regex .*'''$ Python script text executable ++>&0 regex .*'''$ Python script text + !:mime text/x-python + + 0 search/4096 """ +->&0 regex .*"""$ Python script text executable ++>&0 regex .*"""$ Python script text + !:mime text/x-python + + # try: + # except: or finally: + # block + 0 search/4096 try: +->&0 regex \^\\s*except.*: Python script text executable ++>&0 regex \^\\s*except.*: Python script text + !:mime text/x-python +->&0 search/4096 finally: Python script text executable ++>&0 search/4096 finally: Python script text !:mime text/x-python --- magic/Magdir/varied.script -+++ magic/Magdir/varied.script 2007-03-21 10:22:09.000000000 +0000 ++++ magic/Magdir/varied.script 2011-06-14 13:52:38.827926417 +0000 @@ -4,12 +4,12 @@ # varied.script: file(1) magic for various interpreter scripts - 0 string #!\ / a + 0 string/t #!\ / a ->3 string >\0 %s script text executable +>3 string >\0 %s script text - 0 string #!\t/ a + 0 string/t #!\t/ a ->3 string >\0 %s script text executable +>3 string >\0 %s script text - 0 string #!/ a + 0 string/t #!/ a ->2 string >\0 %s script text executable --0 string #!\ script text executable +-0 string/t #!\ script text executable +>2 string >\0 %s script text -+0 string #!\ script text ++0 string/t #!\ script text >3 string >\0 for %s # From: arno <arenevier(a)fdn.fr> ++++++ file-5.03-iso9660.dif -> file-5.07-iso9660.dif ++++++ --- file/file-5.03-iso9660.dif 2009-10-27 17:06:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-iso9660.dif 2011-06-14 19:53:38.000000000 +0200 @@ -1,7 +1,7 @@ --- magic/Magdir/filesystems -+++ magic/Magdir/filesystems 2009-10-27 16:55:38.087429836 +0100 -@@ -1198,6 +1198,7 @@ - 32769 string CD001 ++++ magic/Magdir/filesystems 2009-10-27 15:55:38.000000000 +0000 +@@ -1236,6 +1236,7 @@ + 32769 string CD001 # !:mime application/x-iso9660-image >38913 string !NSR0 ISO 9660 CD-ROM filesystem data +!:mime application/x-iso9660-image ++++++ file-5.04-llvm.dif -> file-5.07-llvm.dif ++++++ --- file/file-5.04-llvm.dif 2010-04-19 16:19:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.07-llvm.dif 2011-06-14 19:53:39.000000000 +0200 @@ -1,9 +1,11 @@ --- magic/Magdir/llvm -+++ magic/Magdir/llvm 2010-04-19 14:13:15.518924957 +0000 -@@ -9,3 +9,6 @@ ++++ magic/Magdir/llvm 2010-04-19 14:13:16.000000000 +0000 +@@ -9,5 +9,8 @@ 0 string llvc0 LLVM byte-codes, null compression 0 string llvc1 LLVM byte-codes, gzip compression 0 string llvc2 LLVM byte-codes, bzip2 compression + +0 string BC\xc0\xde LLVM bitcode +0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper + 0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper + 0 string BC\xc0\xde LLVM bitcode ++++++ file-5.02-misc.dif -> file-5.07-misc.dif ++++++ --- file/file-5.02-misc.dif 2010-02-05 17:16:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-misc.dif 2011-06-14 19:53:40.000000000 +0200 @@ -1,15 +1,6 @@ --- magic/Magdir/audio -+++ magic/Magdir/audio 2008-04-14 16:17:59.000000000 +0200 -@@ -116,7 +116,7 @@ - # Real Audio (Magic .ra\0375) - 0 belong 0x2e7261fd RealAudio sound file - !:mime audio/x-pn-realaudio --0 string .RMF RealMedia file -+0 string .RMF\0\0\0 RealMedia file - !:mime application/vnd.rn-realmedia - #video/x-pn-realvideo - #video/vnd.rn-realvideo -@@ -127,7 +127,7 @@ ++++ magic/Magdir/audio 2008-04-14 14:17:59.000000000 +0000 +@@ -129,7 +129,7 @@ # Oct 31, 1995 # fixed by <doj(a)cubic.org> 2003-06-24 # Too short... @@ -19,8 +10,8 @@ #0 string JN Composer 669 Module sound data (extended format) 0 string MAS_U ULT(imate) Module sound data --- magic/Magdir/bsdi -+++ magic/Magdir/bsdi 2003-12-08 17:50:03.000000000 +0100 -@@ -19,7 +19,7 @@ ++++ magic/Magdir/bsdi 2003-12-08 16:50:03.000000000 +0000 +@@ -21,7 +21,7 @@ >32 byte 0x6a (uses shared libs) # same as in SunOS 4.x, except for static shared libraries @@ -29,7 +20,7 @@ >0 byte &0x80 >>20 belong <4096 shared library >>20 belong =4096 dynamically linked executable -@@ -28,13 +28,13 @@ +@@ -30,13 +30,13 @@ >16 belong >0 not stripped >36 belong 0xb4100001 (uses shared libs) @@ -45,33 +36,9 @@ >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped ---- magic/Magdir/commands -+++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200 -@@ -12,6 +12,8 @@ - !:mime text/x-shellscript - 0 string/w #!\ /bin/tcsh Tenex C shell script text executable - !:mime text/x-shellscript -+0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable -+!:mime text/x-shellscript - 0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable - !:mime text/x-shellscript - 0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable -@@ -54,7 +56,11 @@ - 0 string/w #!\ /bin/rc Plan 9 rc shell script text executable - - # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) --0 string/w #!\ /bin/bash Bourne-Again shell script text executable -+0 string/w #!\ /bin/bash Bourne-Again shell script text executable -+!:mime text/x-shellscript -+0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable -+!:mime text/x-shellscript -+0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable - !:mime text/x-shellscript - 0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable - !:mime text/x-shellscript --- magic/Magdir/mach -+++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 -@@ -74,7 +74,7 @@ ++++ magic/Magdir/mach 2003-12-08 16:50:03.000000000 +0000 +@@ -76,7 +76,7 @@ >4 belong 11 hppa >4 belong 12 acorn >4 belong 13 m88k @@ -80,20 +47,9 @@ >4 belong 15 i860-big >4 belong 16 i860 >4 belong 17 rs6000 ---- magic/Magdir/msdos -+++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200 -@@ -271,7 +271,7 @@ - - # a few unknown ZIP sfxes, no idea if they are needed or if they are - # already captured by the generic patterns above -->122 string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive -+>0x7a string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive - >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP) - # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive - # --- magic/Magdir/netbsd -+++ magic/Magdir/netbsd 2003-12-08 17:50:03.000000000 +0100 -@@ -101,25 +101,25 @@ ++++ magic/Magdir/netbsd 2003-12-08 16:50:03.000000000 +0000 +@@ -102,25 +102,25 @@ 0 belong&0377777777 045200507 a.out NetBSD/powerpc core >12 string >\0 from '%s' @@ -124,8 +80,8 @@ >32 belong !0 (signal %d) --- magic/Magdir/sun -+++ magic/Magdir/sun 2006-11-22 15:49:20.000000000 +0100 -@@ -5,7 +5,7 @@ ++++ magic/Magdir/sun 2006-11-22 14:49:20.000000000 +0000 +@@ -6,7 +6,7 @@ # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x # releases. (5.x uses ELF.) # @@ -134,7 +90,7 @@ >0 byte &0x80 >>20 belong <4096 shared library >>20 belong =4096 dynamically linked executable -@@ -13,12 +13,12 @@ +@@ -14,12 +14,12 @@ >0 byte ^0x80 executable >16 belong >0 not stripped ++++++ file-5.02-option.dif -> file-5.07-option.dif ++++++ --- file/file-5.02-option.dif 2009-05-05 14:43:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.07-option.dif 2011-06-14 19:53:41.000000000 +0200 @@ -1,6 +1,6 @@ --- src/file.c -+++ src/file.c 2009-05-05 14:05:15.133901855 +0200 -@@ -214,6 +214,8 @@ main(int argc, char *argv[]) ++++ src/file.c 2009-05-05 12:05:15.000000000 +0000 +@@ -195,6 +195,8 @@ main(int argc, char *argv[]) flags |= MAGIC_DEBUG|MAGIC_CHECK; break; case 'e': @@ -9,7 +9,7 @@ for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -225,7 +227,7 @@ main(int argc, char *argv[]) +@@ -206,7 +208,7 @@ main(int argc, char *argv[]) break; case 'f': @@ -18,7 +18,7 @@ usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -234,6 +236,8 @@ main(int argc, char *argv[]) +@@ -215,6 +217,8 @@ main(int argc, char *argv[]) ++didsomefiles; break; case 'F': @@ -27,8 +27,8 @@ separator = optarg; break; case 'i': -@@ -243,6 +247,8 @@ main(int argc, char *argv[]) - flags |= MAGIC_CONTINUE; +@@ -227,6 +231,8 @@ main(int argc, char *argv[]) + action = FILE_LIST; break; case 'm': + if (!optarg) ++++++ file-5.04-visibility.patch -> file-5.07-visibility.patch ++++++ --- file/file-5.04-visibility.patch 2010-11-05 23:44:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-visibility.patch 2011-06-14 19:53:41.000000000 +0200 @@ -1,17 +1,17 @@ ---- src/Makefile.am.orig -+++ src/Makefile.am +--- src/Makefile.am ++++ src/Makefile.am 2011-06-14 14:05:18.691926054 +0000 @@ -11,7 +11,7 @@ libmagic_la_SOURCES = magic.c apprentice encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \ - funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \ + funcs.c file.h names.h readelf.h tar.h apptype.c \ file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h -libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0 +libmagic_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmagic.map -no-undefined -version-info 1:0:0 - libmagic_la_LIBADD = $(LTLIBOBJS) - - file_SOURCES = file.c ---- /dev/null -+++ src/libmagic.map -@@ -0,0 +1,16 @@ + if MINGW + MINGWLIBS = -lgnurx -lshlwapi + else +--- src/libmagic.map ++++ src/libmagic.map 2011-06-14 00:00:00.000000000 +0000 +@@ -0,0 +1,17 @@ +{ +global: + magic_buffer; @@ -23,9 +23,9 @@ + magic_error; + magic_file; + magic_getpath; ++ magic_list; + magic_load; + magic_open; + magic_setflags; +local: *; +}; -\ No newline at end of file ++++++ file-5.04-zip2.0.dif -> file-5.07-zip2.0.dif ++++++ --- file/file-5.04-zip2.0.dif 2010-02-05 17:16:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07-zip2.0.dif 2011-06-14 19:53:43.000000000 +0200 @@ -1,13 +1,13 @@ --- magic/Magdir/archive -+++ magic/Magdir/archive 2010-02-05 15:43:36.517302304 +0000 -@@ -581,6 +581,10 @@ - !:mime application/zip - >>4 byte 0x14 Zip archive data, at least v2.0 to extract ++++ magic/Magdir/archive 2010-02-05 15:43:37.000000000 +0000 +@@ -564,6 +564,10 @@ + # PKZIP multi-volume archive + 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract !:mime application/zip +>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract +>>>34 ubelong 0x74797065 \b, mime type +>>>>38 regex application/[a-z\+\-]+ \b %s +!:mime application/unknown+zip - # OpenOffice.org / KOffice / StarOffice documents - # Listed here because they ARE zip files + # Zip archives (Greg Roelofs, c/o zip-bugs(a)wkuvx1.wku.edu) + 0 string PK\003\004 ++++++ file-4.16-python.dif -> file-5.07.dif ++++++ --- file/file-4.16-python.dif 2007-12-06 00:11:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-5.07.dif 2011-06-14 19:53:44.000000000 +0200 @@ -1,13 +1,424 @@ ---- python/setup.py -+++ python/setup.py 2006-02-10 09:51:18.000000000 +0100 -@@ -3,8 +3,8 @@ - - magic_module = Extension('magic', - libraries = ['magic'], -- library_dirs = ['./','../','../src','/usr/lib/'], -- include_dirs = ['./','../','../src','/usr/include/'], -+ library_dirs = ['./','../','../src/.libs','/usr/lib/'], -+ include_dirs = ['./','../','../src/','/usr/include/'], - sources = ['py_magic.c']) +--- magic/Magdir/elf ++++ magic/Magdir/elf 2006-11-22 14:57:15.000000000 +0000 +@@ -102,7 +102,7 @@ + >>18 leshort 47 Renesas H8/300H, + >>18 leshort 48 Renesas H8S, + >>18 leshort 49 Renesas H8/500, +->>18 leshort 50 IA-64, ++>>18 leshort 50 IA-64 (Intel 64 bit architecture), + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -247,7 +247,7 @@ + >>18 beshort 47 Renesas H8/300H, + >>18 beshort 48 Renesas H8S, + >>18 beshort 49 Renesas H8/500, +->>18 beshort 50 IA-64, ++>>18 beshort 50 IA-64 (Intel 64 bit architecture), + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2009-05-05 12:25:21.000000000 +0000 +@@ -94,21 +94,43 @@ + # and Nicol�s Lichtmaier <nick(a)debian.org> + # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >0x1ff +->>>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++514 string HdrS Linux ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 11:29:19.000000000 +0000 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2011-06-14 14:36:26.175926257 +0000 +@@ -98,9 +98,9 @@ + >>>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) + >>>(0x3c.l+22) leshort&0x1000 >0 system file + >>>(0x3c.l+24) leshort 0x010b +->>>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + >>>(0x3c.l+24) leshort 0x020b +->>>>(0x3c.l+248) lelong >0 Mono/.Net assembly ++>>>>(0x3c.l+248) lelong >0 \b, Mono/.Net assembly - setup (name = 'Magic file extensions', + # hooray, there's a DOS extender using the PE format, with a valid PE + # executable inside (which just prints a message and exits if run in win) +--- magic/Makefile.am ++++ magic/Makefile.am 2011-06-14 14:32:37.504427061 +0000 +@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) + +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ +@@ -19,7 +19,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ + $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/asterix \ +@@ -69,7 +68,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -102,19 +100,19 @@ $(MAGIC_FRAGMENT_DIR)/ispell \ + $(MAGIC_FRAGMENT_DIR)/isz \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/mach \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/maple \ +@@ -131,10 +129,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msooxml \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ +@@ -173,6 +171,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ + $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/revision \ + $(MAGIC_FRAGMENT_DIR)/riff \ ++$(MAGIC_FRAGMENT_DIR)/apple \ ++$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/rinex \ + $(MAGIC_FRAGMENT_DIR)/rpm \ + $(MAGIC_FRAGMENT_DIR)/rtf \ +@@ -238,8 +238,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} ++ ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ + + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file +@@ -251,8 +263,5 @@ FILE_COMPILE = $(top_builddir)/src/file + FILE_COMPILE_DEP = $(FILE_COMPILE) + endif + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @rm -fr magic +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW) +--- src/Makefile.am ++++ src/Makefile.am 2008-04-14 15:14:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + +--- src/dcore.c ++++ src/dcore.c 2006-03-27 11:29:19.000000000 +0000 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy(a)zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-5.04.tar.bz2 -> file-5.07.tar.bz2 ++++++ ++++ 69234 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0