commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2016-02-25 21:57:44 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is "android-tools" Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2015-11-04 15:30:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2016-02-25 22:35:26.0 +0100 @@ -1,0 +2,5 @@ +Mon Feb 15 13:40:59 UTC 2016 - dmitr...@opensuse.org + +- Fix systemd-udevd warning [boo#965512] + +--- Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.QKfuvB/_old 2016-02-25 22:35:28.0 +0100 +++ /var/tmp/diff_new_pack.QKfuvB/_new 2016-02-25 22:35:28.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package android-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ 51-android.rules ++ --- /var/tmp/diff_new_pack.QKfuvB/_old 2016-02-25 22:35:28.0 +0100 +++ /var/tmp/diff_new_pack.QKfuvB/_new 2016-02-25 22:35:28.0 +0100 @@ -112,4 +112,4 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0930", TAG+="uaccess" # ZTE -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", TAG+="uaccess" \ No newline at end of file +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", TAG+="uaccess"
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2015-11-04 15:30:54 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is "android-tools" Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2015-07-16 17:17:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2015-11-04 15:30:55.0 +0100 @@ -1,0 +2,6 @@ +Mon Oct 26 13:53:33 UTC 2015 - dmitr...@opensuse.org + +- Split udev rules to android-tools-udev package. Use rules from + libmtp-udev by default. [boo#938659] + +--- Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.WOESQJ/_old 2015-11-04 15:30:55.0 +0100 +++ /var/tmp/diff_new_pack.WOESQJ/_new 2015-11-04 15:30:55.0 +0100 @@ -48,7 +48,7 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(udev) -Requires: udev +Requires: libmtp-udev %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } %description @@ -56,6 +56,18 @@ Android device over a USB link from a computer. Fastboot is a command line tool used to directly flash the filesystem in Android devices from a host via USB. +%package -n %{name}-udev +Summary:Udev rules for accessing Android devices +Group: Hardware/Mobile +Requires: udev + +%description -n %{name}-udev +This package contains additional udev rules that allow Android Debug Bridge (adb) access to +Android based devices. + +Warning! By default adb uses udev rules from libmtp-udev package. This package can conflict +with other udev rules for different devices. + %prep %setup -q -a1 -a2 -a3 -n core-%{version} mv extras-%{version} extras @@ -74,7 +86,7 @@ install -D -m 0644 %{SOURCE7} %{buildroot}%{_udevrulesdir}/51-android.rules make install DESTDIR=%{buildroot} BINDIR=%{_bindir} -%post +%post -n %{name}-udev %{?udev_rules_update:%{udev_rules_update}} %files @@ -82,6 +94,9 @@ %doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt %{_bindir}/adb %{_bindir}/fastboot + +%files -n %{name}-udev +%defattr(-,root,root) %{_udevrulesdir}/51-android.rules %changelog
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2015-07-16 17:17:02 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2015-07-02 22:45:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2015-07-16 17:17:03.0 +0200 @@ -1,0 +2,10 @@ +Tue Jul 14 07:18:53 UTC 2015 - dmitr...@opensuse.org + +- Update to version 5.1.1_r8 + * No changelog available +- Drop obsolete fix-overflow-in-adb_client.patch +- Drop obsolete android-tools-ppc64-types.patch +- Fix implicit definition + * f2fs-tools-implicit-definitions.patch + +--- Old: android-tools-ppc64-types.patch core-4.2.2_r1.tar.bz2 extras-4.2.2_r1.tar.bz2 fix-overflow-in-adb_client.patch New: core-5.1.1_r8.tar.bz2 extras-5.1.1_r8.tar.bz2 f2fs-tools-5.1.1_r8.tar.bz2 f2fs-tools-implicit-definitions.patch libselinux-5.1.1_r8.tar.bz2 Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.WH3VH4/_old 2015-07-16 17:17:04.0 +0200 +++ /var/tmp/diff_new_pack.WH3VH4/_new 2015-07-16 17:17:04.0 +0200 @@ -17,29 +17,36 @@ Name: android-tools -Version:4.2.2_r1 +Version:5.1.1_r8 Release:0 Summary:Android platform tools (adb, fastboot) License:Apache-2.0 and BSD-3-Clause Group: Hardware/Mobile Url:http://developer.android.com/guide/developing/tools/ # git clone https://android.googlesource.com/platform/system/core.git cd core -# git archive android-%{version} --prefix=core-%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | bzip2 ../core-%{version}.tar.bz2 +# git archive android-%{version} --prefix=core-%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/utils include/private include/zipfile include/mincrypt | bzip2 ../core-%{version}.tar.bz2 # # git clone https://android.googlesource.com/platform/system/extras.git cd extras -# git archive android-%{version} --prefix=extras/ ext4_utils | bzip2 ../extras-%{version}.tar.bz2 +# git archive android-%{version} --prefix=extras-%{version}/ ext4_utils f2fs_utils | bzip2 ../extras-%{version}.tar.bz2 +# +# git clone https://android.googlesource.com/platform/external/libselinux.git cd libselinux +# git archive android-%{version} --prefix=libselinux-%{version}/ | bzip2 ../libselinux-%{version}.tar.bz2 +# +# git clone https://android.googlesource.com/platform/external/f2fs-tools.git cd f2fs-tools +# git archive android-%{version} --prefix=f2fs-tools-%{version}/ | bzip2 ../f2fs-tools-%{version}.tar.bz2 Source0:core-%{version}.tar.bz2 Source1:extras-%{version}.tar.bz2 -Source2:core-Makefile -Source3:adb-Makefile -Source4:fastboot-Makefile -Source5:51-android.rules -Patch0: android-tools-ppc64-types.patch -Patch1: fix-overflow-in-adb_client.patch - -BuildRequires: libselinux-devel +Source2:libselinux-%{version}.tar.bz2 +Source3:f2fs-tools-%{version}.tar.bz2 +Source4:core-Makefile +Source5:adb-Makefile +Source6:fastboot-Makefile +Source7:51-android.rules +# PATCh-FIX-OPENSUSE f2fs-tools-implicit-definitions.patch -- fix implicit definition +Patch0: f2fs-tools-implicit-definitions.patch BuildRequires: openssl-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(udev) Requires: udev %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } @@ -50,20 +57,21 @@ to directly flash the filesystem in Android devices from a host via USB. %prep -%setup -q -b 1 -n extras -%patch0 -p1 -%setup -q -b 0 -n core-%{version} -cp -p %{SOURCE2} Makefile -cp -p %{SOURCE3} adb/Makefile -cp -p %{SOURCE4} fastboot/Makefile -%patch1 -p1 +%setup -q -a1 -a2 -a3 -n core-%{version} +mv extras-%{version} extras +mv libselinux-%{version} libselinux +mv f2fs-tools-%{version} f2fs-tools +%patch0 +cp -p %{SOURCE4} Makefile +cp -p %{SOURCE5} adb/Makefile +cp -p %{SOURCE6} fastboot/Makefile %build make %{?_smp_mflags} %install install -d -m 0755 %{buildroot}%{_bindir} -install -D -m 0644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/51-android.rules +install -D -m 0644 %{SOURCE7} %{buildroot}%{_udevrulesdir}/51-android.rules make install DESTDIR=%{buildroot} BINDIR=%{_bindir}
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2015-07-02 22:45:33 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2014-10-11 19:25:07.0 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2015-07-02 22:45:35.0 +0200 @@ -1,0 +2,6 @@ +Tue Jun 23 22:21:16 UTC 2015 - crrodrig...@opensuse.org + +- 51-android.rules: Use TAG+=uaccess instead of using + group/mode access control. + +--- Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.WjXxs5/_old 2015-07-02 22:45:36.0 +0200 +++ /var/tmp/diff_new_pack.WjXxs5/_new 2015-07-02 22:45:36.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package android-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ 51-android.rules ++ --- /var/tmp/diff_new_pack.WjXxs5/_old 2015-07-02 22:45:36.0 +0200 +++ /var/tmp/diff_new_pack.WjXxs5/_new 2015-07-02 22:45:36.0 +0200 @@ -2,140 +2,140 @@ # adb/usb_vendors.c # Acer -SUBSYSTEM==usb, ATTR{idVendor}==0502, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0502, TAG+=uaccess # Dell -SUBSYSTEM==usb, ATTR{idVendor}==413c, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==413c, TAG+=uaccess # Foxconn -SUBSYSTEM==usb, ATTR{idVendor}==0489, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0489, TAG+=uaccess # Garmin-Asus -SUBSYSTEM==usb, ATTR{idVendor}==091E, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==091E, TAG+=uaccess # Google -SUBSYSTEM==usb, ATTR{idVendor}==18d1, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==18d1, TAG+=uaccess # HTC -SUBSYSTEM==usb, ATTR{idVendor}==0bb4, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0bb4, TAG+=uaccess # Huawei -SUBSYSTEM==usb, ATTR{idVendor}==12d1, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==12d1, TAG+=uaccess # Kyocera -SUBSYSTEM==usb, ATTR{idVendor}==0482, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0482, TAG+=uaccess # LG -SUBSYSTEM==usb, ATTR{idVendor}==1004, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==1004, TAG+=uaccess # Motorola -SUBSYSTEM==usb, ATTR{idVendor}==22b8, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==22b8, TAG+=uaccess # Nvidia -SUBSYSTEM==usb, ATTR{idVendor}==0955, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0955, TAG+=uaccess # Pantech -SUBSYSTEM==usb, ATTR{idVendor}==10A9, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==10A9, TAG+=uaccess # Samsung -SUBSYSTEM==usb, ATTR{idVendor}==04e8, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==04e8, TAG+=uaccess # Sharp -SUBSYSTEM==usb, ATTR{idVendor}==04dd, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==04dd, TAG+=uaccess # Sony Ericsson -SUBSYSTEM==usb, ATTR{idVendor}==0fce, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0fce, TAG+=uaccess # ZTE -SUBSYSTEM==usb, ATTR{idVendor}==19d2, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==19d2, TAG+=uaccess # Qualcomm -SUBSYSTEM==usb, ATTR{idVendor}==05c6, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==05c6, TAG+=uaccess # On-The-Go-Video -SUBSYSTEM==usb, ATTR{idVendor}==2257, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==2257, TAG+=uaccess # NEC -SUBSYSTEM==usb, ATTR{idVendor}==0409, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0409, TAG+=uaccess # Panasonic -SUBSYSTEM==usb, ATTR{idVendor}==04da, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==04da, TAG+=uaccess # Toshiba -SUBSYSTEM==usb, ATTR{idVendor}==0930, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0930, TAG+=uaccess # SK Telesys -SUBSYSTEM==usb, ATTR{idVendor}==1f53, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==1f53, TAG+=uaccess # KT Tech -SUBSYSTEM==usb, ATTR{idVendor}==2116, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==2116, TAG+=uaccess # ASUS -SUBSYSTEM==usb, ATTR{idVendor}==0b05, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0b05, TAG+=uaccess # Philips -SUBSYSTEM==usb, ATTR{idVendor}==0471, MODE=0660, GROUP=users +SUBSYSTEM==usb, ATTR{idVendor}==0471, TAG+=uaccess # Texas Instruments -SUBSYSTEM==usb, ATTR{idVendor}==0451, MODE=0660,
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2014-10-11 19:25:01 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2014-05-05 21:09:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2014-10-11 19:25:07.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 19 04:58:19 UTC 2014 - crrodrig...@opensuse.org + +- Use udevrulesdir and call udev_rules_update when appropiate + +--- Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.c3Vrdm/_old 2014-10-11 19:25:08.0 +0200 +++ /var/tmp/diff_new_pack.c3Vrdm/_new 2014-10-11 19:25:08.0 +0200 @@ -39,15 +39,10 @@ BuildRequires: libselinux-devel BuildRequires: openssl-devel -BuildRequires: udev BuildRequires: zlib-devel +BuildRequires: pkgconfig(udev) Requires: udev - -%if %( echo `rpm -q --queryformat %%{version} udev` ) 190 -%define _udevprefix /usr/lib -%else -%define _udevprefix /lib -%endif +%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } %description Android Debug Bridge (adb) is a command-line tool used to communicate with and control @@ -68,14 +63,17 @@ %install install -d -m 0755 %{buildroot}%{_bindir} -install -D -m 0644 %{SOURCE5} %{buildroot}%{_udevprefix}/udev/rules.d/51-android.rules +install -D -m 0644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/51-android.rules make install DESTDIR=%{buildroot} BINDIR=%{_bindir} +%post +%{?udev_rules_update:%{udev_rules_update}} + %files %defattr(-,root,root) %doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt %{_bindir}/adb %{_bindir}/fastboot -%{_udevprefix}/udev/rules.d/51-android.rules +%{_udevrulesdir}/51-android.rules %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2014-05-05 21:09:30 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2013-03-08 09:07:20.0 +0100 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2014-05-05 21:09:31.0 +0200 @@ -1,0 +2,6 @@ +Fri May 2 20:12:27 UTC 2014 - dmitr...@opensuse.org + +- Fix overflow in adb CVE-2014-1909 [bnc#863074] + * fix-overflow-in-adb_client.patch + +--- New: fix-overflow-in-adb_client.patch Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.Nom37r/_old 2014-05-05 21:09:32.0 +0200 +++ /var/tmp/diff_new_pack.Nom37r/_new 2014-05-05 21:09:32.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package android-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -35,6 +35,7 @@ Source4:fastboot-Makefile Source5:51-android.rules Patch0: android-tools-ppc64-types.patch +Patch1: fix-overflow-in-adb_client.patch BuildRequires: libselinux-devel BuildRequires: openssl-devel @@ -60,6 +61,7 @@ cp -p %{SOURCE2} Makefile cp -p %{SOURCE3} adb/Makefile cp -p %{SOURCE4} fastboot/Makefile +%patch1 -p1 %build make %{?_smp_mflags} ++ fix-overflow-in-adb_client.patch ++ From 75e0645921cb6c3e9d33672733372f519bf57f38 Mon Sep 17 00:00:00 2001 From: Nick Kralevich n...@google.com Date: Tue, 10 Dec 2013 10:18:10 -0800 Subject: [PATCH] Fix overflow in adb_client Credit: Joshua Drake Bug: 12060953 (cherry picked from commit e89e09dd2b9b42184973e3ade291186a2737bced) Change-Id: I8a9b2592a5e4f7527c607abfe4ea6df6eb550aa8 --- adb/adb_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adb/adb_client.c b/adb/adb_client.c index f7823a8..586cd7b 100644 --- a/adb/adb_client.c +++ b/adb/adb_client.c @@ -241,7 +241,7 @@ int adb_connect(const char *service) } else { // if server was running, check its version to make sure it is not out of date char buf[100]; -int n; +size_t n; int version = ADB_SERVER_VERSION - 1; // if we have a file descriptor, then parse version result @@ -250,7 +250,7 @@ int adb_connect(const char *service) buf[4] = 0; n = strtoul(buf, 0, 16); -if(n (int)sizeof(buf)) goto error; +if(n sizeof(buf)) goto error; if(readx(fd, buf, n)) goto error; adb_close(fd); -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2013-03-08 09:07:18 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2013-01-29 06:43:02.0 +0100 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2013-03-08 09:07:20.0 +0100 @@ -1,0 +2,7 @@ +Thu Feb 14 19:39:22 UTC 2013 - dmitr...@opensuse.org + +- Update to version 4.2.2_r2 + * no changelog available +- Remove provide section from package + +--- Old: core-4.2.1_r1.tar.bz2 extras-4.2.1_r1.tar.bz2 New: core-4.2.2_r1.tar.bz2 extras-4.2.2_r1.tar.bz2 Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.9jBYaU/_old 2013-03-08 09:07:21.0 +0100 +++ /var/tmp/diff_new_pack.9jBYaU/_new 2013-03-08 09:07:21.0 +0100 @@ -17,7 +17,7 @@ Name: android-tools -Version:4.2.1_r1 +Version:4.2.2_r1 Release:0 Summary:Android platform tools (adb, fastboot) License:Apache-2.0 and BSD-3-Clause @@ -42,9 +42,6 @@ BuildRequires: zlib-devel Requires: udev -Provides: adb -Provides: fastboot - %if %( echo `rpm -q --queryformat %%{version} udev` ) 190 %define _udevprefix /usr/lib %else @@ -70,7 +67,7 @@ %install install -d -m 0755 %{buildroot}%{_bindir} install -D -m 0644 %{SOURCE5} %{buildroot}%{_udevprefix}/udev/rules.d/51-android.rules -%make_install DESTDIR=%{buildroot} BINDIR=%{_bindir} +make install DESTDIR=%{buildroot} BINDIR=%{_bindir} %files %defattr(-,root,root) ++ core-4.2.1_r1.tar.bz2 - core-4.2.2_r1.tar.bz2 ++ ++ extras-4.2.1_r1.tar.bz2 - extras-4.2.2_r1.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extras/ext4_utils/contents.c new/extras/ext4_utils/contents.c --- old/extras/ext4_utils/contents.c2012-10-20 00:46:35.0 +0200 +++ new/extras/ext4_utils/contents.c2012-12-19 00:27:26.0 +0100 @@ -44,11 +44,6 @@ len += dentry_len; } - /* include size of the dentry used to pad until the end of the block */ - if (len % info.block_size + 8 info.block_size) - len += info.block_size - (len % info.block_size); - len += 8; - return len; } @@ -160,11 +155,8 @@ } } - dentry = (struct ext4_dir_entry_2 *)(data + offset); - dentry-inode = 0; - dentry-rec_len = len - offset; - dentry-name_len = 0; - dentry-file_type = EXT4_FT_UNKNOWN; + /* pad the last dentry out to the end of the block */ + dentry-rec_len += len - offset; return inode_num; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extras/ext4_utils/make_ext4fs.c new/extras/ext4_utils/make_ext4fs.c --- old/extras/ext4_utils/make_ext4fs.c 2012-10-20 00:46:35.0 +0200 +++ new/extras/ext4_utils/make_ext4fs.c 2012-12-19 00:27:26.0 +0100 @@ -104,18 +104,30 @@ { int entries = 0; struct dentry *dentries; - struct dirent **namelist; + struct dirent **namelist = NULL; struct stat stat; int ret; int i; u32 inode; u32 entry_inode; u32 dirs = 0; + bool needs_lost_and_found = false; - entries = scandir(full_path, namelist, filter_dot, (void*)alphasort); - if (entries 0) { - error_errno(scandir); - return EXT4_ALLOCATE_FAILED; + if (full_path) { + entries = scandir(full_path, namelist, filter_dot, (void*)alphasort); + if (entries 0) { + error_errno(scandir); + return EXT4_ALLOCATE_FAILED; + } + } + + if (dir_inode == 0) { + /* root directory, check if lost+found already exists */ + for (i = 0; i entries; i++) + if (strcmp(namelist[i]-d_name, lost+found) == 0) + break; + if (i == entries) + needs_lost_and_found = true; } dentries = calloc(entries, sizeof(struct dentry)); @@ -195,6 +207,34 @@ } free(namelist); + if (needs_lost_and_found) { + /* insert a lost+found directory at the beginning of the dentries */ + struct dentry *tmp = calloc(entries + 1, sizeof(struct dentry)); +
commit android-tools for openSUSE:Factory
Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2013-01-29 06:43:00 Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) Package is android-tools, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2013-01-17 13:18:16.0 +0100 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2013-01-29 06:43:02.0 +0100 @@ -1,0 +2,5 @@ +Mon Jan 28 00:18:10 UTC 2013 - dval...@suse.com + +- fix wrong types for ppc64 (android-tools-ppc64-types.patch) + +--- New: android-tools-ppc64-types.patch Other differences: -- ++ android-tools.spec ++ --- /var/tmp/diff_new_pack.eXaurX/_old 2013-01-29 06:43:04.0 +0100 +++ /var/tmp/diff_new_pack.eXaurX/_new 2013-01-29 06:43:04.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package android-tools # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: android-tools Version:4.2.1_r1 Release:0 Summary:Android platform tools (adb, fastboot) License:Apache-2.0 and BSD-3-Clause -Url:http://developer.android.com/guide/developing/tools/ Group: Hardware/Mobile +Url:http://developer.android.com/guide/developing/tools/ # git clone https://android.googlesource.com/platform/system/core.git cd core # git archive android-%{version} --prefix=core-%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | bzip2 ../core-%{version}.tar.bz2 # @@ -33,11 +34,12 @@ Source3:adb-Makefile Source4:fastboot-Makefile Source5:51-android.rules +Patch0: android-tools-ppc64-types.patch BuildRequires: libselinux-devel BuildRequires: openssl-devel -BuildRequires: zlib-devel BuildRequires: udev +BuildRequires: zlib-devel Requires: udev Provides: adb @@ -56,6 +58,7 @@ %prep %setup -q -b 1 -n extras +%patch0 -p1 %setup -q -b 0 -n core-%{version} cp -p %{SOURCE2} Makefile cp -p %{SOURCE3} adb/Makefile ++ android-tools-ppc64-types.patch ++ Index: extras/ext4_utils/ext4_utils.c === --- extras.orig/ext4_utils/ext4_utils.c +++ extras/ext4_utils/ext4_utils.c @@ -402,8 +402,8 @@ u64 get_file_size(int fd) { struct stat buf; int ret; - u64 reserve_len = 0; - s64 computed_size; + __u64 reserve_len = 0; + __s64 computed_size; ret = fstat(fd, buf); if (ret) Index: extras/ext4_utils/ext4_utils.h === --- extras.orig/ext4_utils/ext4_utils.h +++ extras/ext4_utils/ext4_utils.h @@ -84,8 +84,13 @@ extern int force; #define __u16 u16 #define __u8 u8 +#if defined(__powerpc64__) +typedef unsigned long u64; +typedef signed long s64; +#else typedef unsigned long long u64; typedef signed long long s64; +#endif typedef unsigned int u32; typedef unsigned short int u16; typedef unsigned char u8; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org