Hello community, here is the log from the commit of package libmtp for openSUSE:13.1 checked in at 2013-09-29 19:27:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/libmtp (Old) and /work/SRC/openSUSE:13.1/.libmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmtp" Changes: -------- --- /work/SRC/openSUSE:13.1/libmtp/libmtp.changes 2013-09-23 10:57:50.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.libmtp.new/libmtp.changes 2013-09-29 19:27:24.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 27 19:54:22 UTC 2013 - rmila...@suse.com + +- Use LIBMTP_ERROR instead of LIBMTP_INFO function in mtpz_loaddata + (mtpz.c) to dont get junk in the udev rule when generating the rule. + add: mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch + +------------------------------------------------------------------- New: ---- mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmtp.spec ++++++ --- /var/tmp/diff_new_pack.poc0Ik/_old 2013-09-29 19:27:24.000000000 +0200 +++ /var/tmp/diff_new_pack.poc0Ik/_new 2013-09-29 19:27:24.000000000 +0200 @@ -30,6 +30,7 @@ Release: 0 %define sonum 9 Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz +Patch0: mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d %define _udevdir %(pkg-config --variable=udevdir udev) @@ -75,6 +76,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --with-udev=%{_udevdir} --disable-static --enable-doxygen ++++++ mtpz-use-LIBMTP_ERROR-instead-of-LIBMTP_INFO.patch ++++++ Index: libmtp-1.1.6/src/mtpz.c =================================================================== --- libmtp-1.1.6.orig/src/mtpz.c +++ libmtp-1.1.6/src/mtpz.c @@ -119,7 +119,7 @@ int mtpz_loaddata() char *home = getenv("HOME"); if (!home) { - LIBMTP_INFO("Unable to determine user's home directory, MTPZ disabled"); + LIBMTP_ERROR("Unable to determine user's home directory, MTPZ disabled"); return -1; } @@ -130,7 +130,7 @@ int mtpz_loaddata() FILE *fdata = fopen(path, "r"); if (!fdata) { - LIBMTP_INFO("Unable to open ~/.mtpz-data for reading, MTPZ disabled."); + LIBMTP_ERROR("Unable to open ~/.mtpz-data for reading, MTPZ disabled."); return -1; } @@ -138,7 +138,7 @@ int mtpz_loaddata() MTPZ_PUBLIC_EXPONENT = (unsigned char *)fgets_strip((char *)malloc(8), 8, fdata); if (!MTPZ_PUBLIC_EXPONENT) { - LIBMTP_INFO("Unable to read MTPZ public exponent from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ public exponent from ~/.mtpz-data, MTPZ disabled"); return -1; } @@ -146,20 +146,20 @@ int mtpz_loaddata() char *hexenckey = (unsigned char *)fgets_strip((char *)malloc(35), 35, fdata); if (!hexenckey) { - LIBMTP_INFO("Unable to read MTPZ encryption key from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ encryption key from ~/.mtpz-data, MTPZ disabled"); return -1; } MTPZ_ENCRYPTION_KEY = hex_to_bytes(hexenckey, strlen(hexenckey)); if (!MTPZ_ENCRYPTION_KEY) { - LIBMTP_INFO("Unable to read MTPZ encryption key from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ encryption key from ~/.mtpz-data, MTPZ disabled"); } // Should only be 256 characters in length, but fgets will encounter a newline and stop. MTPZ_MODULUS = (unsigned char *)fgets_strip((char *)malloc(260), 260, fdata); if (!MTPZ_MODULUS) { - LIBMTP_INFO("Unable to read MTPZ modulus from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ modulus from ~/.mtpz-data, MTPZ disabled"); return -1; } @@ -167,7 +167,7 @@ int mtpz_loaddata() MTPZ_PRIVATE_KEY = (unsigned char *)fgets_strip((char *)malloc(260), 260, fdata); if (!MTPZ_PRIVATE_KEY) { - LIBMTP_INFO("Unable to read MTPZ private key from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ private key from ~/.mtpz-data, MTPZ disabled"); return -1; } @@ -175,13 +175,13 @@ int mtpz_loaddata() char *hexcerts = fgets_strip((char *)malloc(1260), 1260, fdata); if (!hexcerts) { - LIBMTP_INFO("Unable to read MTPZ certificates from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to read MTPZ certificates from ~/.mtpz-data, MTPZ disabled"); return -1; } MTPZ_CERTIFICATES = hex_to_bytes(hexcerts, strlen(hexcerts)); if (!MTPZ_CERTIFICATES) { - LIBMTP_INFO("Unable to parse MTPZ certificates from ~/.mtpz-data, MTPZ disabled"); + LIBMTP_ERROR("Unable to parse MTPZ certificates from ~/.mtpz-data, MTPZ disabled"); return -1; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
