Here is an update to libmtp 1.1.6. Some device additions and bug fixes.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/libmtp/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile 11 Mar 2013 10:50:10 -0000 1.23 +++ Makefile 16 Mar 2013 00:03:42 -0000 @@ -2,8 +2,8 @@ COMMENT= Media Transfer Protocol (MTP) implementation -DISTNAME= libmtp-1.1.5 -SHARED_LIBS += mtp 5.1 # 9.5 +DISTNAME= libmtp-1.1.6 +SHARED_LIBS += mtp 6.0 # 10.0 CATEGORIES= devel HOMEPAGE= http://libmtp.sourceforge.net/ Index: distinfo =================================================================== RCS file: /home/cvs/ports/devel/libmtp/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 26 Jan 2013 09:46:35 -0000 1.10 +++ distinfo 15 Mar 2013 22:19:21 -0000 @@ -1,2 +1,2 @@ -SHA256 (libmtp-1.1.5.tar.gz) = eHZ5Fxuvizzy/MAxlscFq018vJab1x+dNpa+HOfxxjo= -SIZE (libmtp-1.1.5.tar.gz) = 723925 +SHA256 (libmtp-1.1.6.tar.gz) = Ohwcg6+R3kBS61T+t5XBQbTASiUuADGVTrv2F1lwywo= +SIZE (libmtp-1.1.6.tar.gz) = 733519 Index: patches/patch-src_mtpz_c =================================================================== RCS file: /home/cvs/ports/devel/libmtp/patches/patch-src_mtpz_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_mtpz_c --- patches/patch-src_mtpz_c 26 Jan 2013 09:46:35 -0000 1.1 +++ patches/patch-src_mtpz_c 15 Mar 2013 22:31:36 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_mtpz_c,v 1.1 2013/01/26 09:46:35 brad Exp $ ---- src/mtpz.c.orig Sun Sep 2 10:46:25 2012 -+++ src/mtpz.c Mon Jan 14 10:41:14 2013 -@@ -236,7 +236,7 @@ unsigned int mtpz_aes_gb9[]; +--- src/mtpz.c.orig Fri Mar 15 02:34:22 2013 ++++ src/mtpz.c Fri Mar 15 18:31:28 2013 +@@ -238,7 +238,7 @@ unsigned int mtpz_aes_gb9[]; #define MTPZ_ENCRYPTIONBYTE2(val) (((val) >> 8) & 0xFF) #define MTPZ_ENCRYPTIONBYTE3(val) (((val) >> 0) & 0xFF) @@ -10,14 +10,14 @@ $OpenBSD: patch-src_mtpz_c,v 1.1 2013/01 void mtpz_encryption_cipher(unsigned char *data, unsigned int len, char encrypt); void mtpz_encryption_cipher_advanced(unsigned char *key, unsigned int key_len, unsigned char *data, unsigned int data_len, char encrypt); -@@ -248,6 +248,17 @@ void mtpz_encryption_encrypt_custom(unsigned char *dat +@@ -250,6 +250,17 @@ void mtpz_encryption_encrypt_custom(unsigned char *dat void mtpz_encryption_encrypt_mac(unsigned char *hash, unsigned int hash_length, unsigned char *seed, unsigned int seed_len, unsigned char *out); +static inline uint32_t mtpz_bswap32(uint32_t x) +{ +#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) || defined(__clang__) -+ return __builtin_bswap32(x) ++ return __builtin_bswap32(x); +#else + return (x >> 24) | + ((x >> 8) & 0x0000ff00) | @@ -28,7 +28,7 @@ $OpenBSD: patch-src_mtpz_c,v 1.1 2013/01 /* MTPZ RSA implementation */ -@@ -1574,11 +1585,11 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, +@@ -1576,11 +1587,11 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, mtpz_encryption_cipher_advanced((unsigned char *)hash_key, 16, act_msg, 832, 0); act_reader++; @@ -42,7 +42,7 @@ $OpenBSD: patch-src_mtpz_c,v 1.1 2013/01 act_reader += 2; unsigned char *rand_data = (unsigned char *)malloc(rand_length); memcpy(rand_data, act_reader, rand_length); -@@ -1590,19 +1601,19 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, +@@ -1592,19 +1603,19 @@ ptp_mtpz_validatehandshakeresponse (PTPParams* params, free(rand_data); act_reader += rand_length; @@ -65,7 +65,7 @@ $OpenBSD: patch-src_mtpz_c,v 1.1 2013/01 act_reader += 2; unsigned char *machash_data = (unsigned char *)malloc(machash_length); memcpy(machash_data, act_reader, machash_length); -@@ -1636,8 +1647,8 @@ ptp_mtpz_opensecuresyncsession (PTPParams* params, uns +@@ -1638,8 +1649,8 @@ ptp_mtpz_opensecuresyncsession (PTPParams* params, uns mtpz_encryption_encrypt_mac(hash, 16, (unsigned char *)(&macCount), 4, mch); ret = ptp_mtpz_wmdrmpd_enabletrustedfilesoperations(params, Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 21 Dec 2010 18:16:04 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2010/12/21 18:16:04 jasper Exp $ -@lib lib/libmtp.so.${LIBmtp_VERSION} Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/libmtp/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 26 Jan 2013 23:58:36 -0000 1.10 +++ pkg/PLIST 15 Mar 2013 22:33:53 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.10 2013/01/26 23:58:36 nigel Exp $ -%%SHARED%% @bin bin/mtp-albumart @bin bin/mtp-albums @bin bin/mtp-connect @@ -24,6 +23,7 @@ bin/mtp-sendtr include/libmtp.h lib/libmtp.a lib/libmtp.la +@lib lib/libmtp.so.${LIBmtp_VERSION} lib/pkgconfig/ lib/pkgconfig/libmtp.pc share/doc/libmtp/ -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
