automatic version update by autodist [release 5.0.2_r1-1mamba;Tue Jan 20 2015]

51-android.rules

@@ -1,147 +0,0 @@
-# Vendor id from:
-# - http://developer.android.com/guide/developing/device.html
-# - adb/usb_vendors.c
-
-# Quanta
-SUBSYSTEM=="usb", ATTR{idVendor}=="0408", MODE="0666", GROUP="plugdev"
-
-# NEC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="plugdev"
-
-# Gigabyte
-SUBSYSTEM=="usb", ATTR{idVendor}=="0414", MODE="0666", GROUP="plugdev"
-
-# Texas Instruments
-SUBSYSTEM=="usb", ATTR{idVendor}=="0451", MODE="0666", GROUP="plugdev"
-
-# Philips
-SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", GROUP="plugdev"
-
-# Kyocera
-SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", GROUP="plugdev"
-
-# Foxconn
-SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", GROUP="plugdev"
-
-# Fujitsu
-SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", GROUP="plugdev"
-
-# Panasonic
-SUBSYSTEM=="usb", ATTR{idVendor}=="04DA", MODE="0666", GROUP="plugdev"
-
-# Sharp
-SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="plugdev"
-
-# Samsung
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="plugdev"
-
-# Acer
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="plugdev"
-
-# Sony
-SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0666", GROUP="plugdev"
-
-# Qualcomm
-SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", GROUP="plugdev"
-
-# Garmin-Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="091E", MODE="0666", GROUP="plugdev"
-
-# Toshiba
-SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="plugdev"
-
-# Nvidia
-SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", GROUP="plugdev"
-
-# ASUS
-SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="plugdev"
-
-# HTC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="plugdev"
-
-# Archos
-SUBSYSTEM=="usb", ATTR{idVendor}=="0E79", MODE="0666", GROUP="plugdev"
-
-# Funai
-SUBSYSTEM=="usb", ATTR{idVendor}=="0F1C", MODE="0666", GROUP="plugdev"
-
-# Sony Ericsson
-SUBSYSTEM=="usb", ATTR{idVendor}=="0FCE", MODE="0666", GROUP="plugdev"
-
-# LG
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="plugdev"
-
-# Hisense
-SUBSYSTEM=="usb", ATTR{idVendor}=="109b", MODE="0666", GROUP="plugdev"
-
-# Pantech
-SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", MODE="0666", GROUP="plugdev"
-
-# Compal
-SUBSYSTEM=="usb", ATTR{idVendor}=="1219", MODE="0666", GROUP="plugdev"
-
-# Huawei
-SUBSYSTEM=="usb", ATTR{idVendor}=="12D1", MODE="0666", GROUP="plugdev"
-
-# Positivo
-SUBSYSTEM=="usb", ATTR{idVendor}=="1662", MODE="0666", GROUP="plugdev"
-
-# Lenovo
-SUBSYSTEM=="usb", ATTR{idVendor}=="17EF", MODE="0666", GROUP="plugdev"
-
-# Google
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="plugdev"
-
-# Lab126
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", MODE="0666", GROUP="plugdev"
-
-# ZTE
-SUBSYSTEM=="usb", ATTR{idVendor}=="19D2", MODE="0666", GROUP="plugdev"
-
-# T & A Mobile Phones
-SUBSYSTEM=="usb", ATTR{idVendor}=="1BBB", MODE="0666", GROUP="plugdev"
-
-# Pegatron
-SUBSYSTEM=="usb", ATTR{idVendor}=="1D4D", MODE="0666", GROUP="plugdev"
-
-# SK Telesys
-SUBSYSTEM=="usb", ATTR{idVendor}=="1F53", MODE="0666", GROUP="plugdev"
-
-# LenovoMobile
-SUBSYSTEM=="usb", ATTR{idVendor}=="2006", MODE="0666", GROUP="plugdev"
-
-# Nook
-SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", GROUP="plugdev"
-
-# KT Tech
-SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", GROUP="plugdev"
-
-# Yuandao
-SUBSYSTEM=="usb", ATTR{idVendor}=="2207", MODE="0666", GROUP="plugdev"
-
-# On-The-Go-Video
-SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", GROUP="plugdev"
-
-# Motorola
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="plugdev"
-
-# INQ Mobile
-SUBSYSTEM=="usb", ATTR{idVendor}=="2314", MODE="0666", GROUP="plugdev"
-
-# Teleepoch
-SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0666", GROUP="plugdev"
-
-# IRiver
-SUBSYSTEM=="usb", ATTR{idVendor}=="2420", MODE="0666", GROUP="plugdev"
-
-# K-Touch
-SUBSYSTEM=="usb", ATTR{idVendor}=="24E3", MODE="0666", GROUP="plugdev"
-
-# Dell
-SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="plugdev"
-
-# Intel
-SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0666", GROUP="plugdev"
-
-# Vizio
-SUBSYSTEM=="usb", ATTR{idVendor}=="E040", MODE="0666", GROUP="plugdev"

android-tools-5.0.2_r1-remove-selinux-header.patch

@@ -0,0 +1,38 @@
+From 239a63ace3d94c44561580f7e4d0db3e95cd557f Mon Sep 17 00:00:00 2001
+From: Jonathan Dieter <jdieter@lesbg.com>
+Date: Fri, 26 Dec 2014 17:04:54 +0200
+Subject: [PATCH 1/2] Remove android selinux header
+
+Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>
+---
+ ext4_utils/make_ext4fs.c  | 1 -
+ f2fs_utils/f2fs_ioutils.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
+index 2f89ae8..732afbe 100644
+--- a/ext4_utils/make_ext4fs.c
++++ b/ext4_utils/make_ext4fs.c
+@@ -62,7 +62,6 @@
+ 
+ #include <selinux/selinux.h>
+ #include <selinux/label.h>
+-#include <selinux/android.h>
+ 
+ #define O_BINARY 0
+ 
+diff --git a/f2fs_utils/f2fs_ioutils.c b/f2fs_utils/f2fs_ioutils.c
+index 53b7b4b..2706d04 100644
+--- a/f2fs_utils/f2fs_ioutils.c
++++ b/f2fs_utils/f2fs_ioutils.c
+@@ -78,7 +78,6 @@ struct selabel_handle;
+ 
+ #include <selinux/selinux.h>
+ #include <selinux/label.h>
+-#include <selinux/android.h>
+ 
+ #define O_BINARY 0
+ 
+-- 
+2.1.0
+

android-tools-Makefile-adb

@@ -1,10 +1,10 @@
 SRCS+= adb.c
-SRCS+= adb_auth_host.c
 SRCS+= adb_client.c
+SRCS+= adb_auth_host.c
 SRCS+= commandline.c
 SRCS+= console.c
-SRCS+= fdevent.c
 SRCS+= file_sync_client.c
+SRCS+= fdevent.c
 SRCS+= get_my_path_linux.c
 SRCS+= services.c
 SRCS+= sockets.c
@@ -15,29 +15,53 @@ SRCS+= usb_linux.c
 SRCS+= usb_vendors.c
 
 VPATH+= ../libcutils
-SRCS+= list.c
-SRCS+= load_file.c
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
 SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
+SRCS+= load_file.c
 
 VPATH+= ../libzipfile
 SRCS+= centraldir.c
 SRCS+= zipfile.c
 
+VPATH+= ../libmincrypt
+SRCS+= rsa.c
+SRCS+= sha256.c
+SRCS+= sha.c
+SRCS+= p256.c
+SRCS+= p256_ec.c
+SRCS+= p256_ecdsa.c
+
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -D_GNU_SOURCE
+CPPFLAGS+= -D_XOPEN_SOURCE
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -DHAVE_OFF64_T
 CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 
-LIBS+= -lcrypto -lpthread -lz
+CFLAGS+= $(RPM_OPT_FLAGS)
+LIBS= -lrt -lpthread -lz -lcrypto
+LDFLAGS+= $(RPM_LD_FLAGS)
+
+CC= $(TOOLCHAIN)gcc
+LD= $(TOOLCHAIN)gcc
 
 OBJS= $(SRCS:.c=.o)
 
 all: adb
 
 adb: $(OBJS)
-	cc -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+
+install: adb
+	install adb $(DESTDIR)$(BINDIR)
+
+clean:
+	rm -rf $(OBJS)

android-tools-Makefile-fastboot

@@ -1,9 +1,15 @@
-SRCS+=bootimg.c
+SRCS+= protocol.c
-SRCS+=engine.c
+SRCS+= engine.c
-SRCS+=fastboot.c
+SRCS+= bootimg.c
-SRCS+=protocol.c
+SRCS+= fastboot.c
-SRCS+=usb_linux.c
+SRCS+= usb_linux.c
-SRCS+=util_linux.c
+SRCS+= util_linux.c
+SRCS+= util.c
+SRCS+= fs.c
+
+VPATH+= ../libzipfile
+SRCS+= centraldir.c
+SRCS+= zipfile.c
 
 VPATH+= ../libsparse
 SRCS+= backed_block.c
@@ -13,14 +19,9 @@ SRCS+= sparse_crc32.c
 SRCS+= sparse_err.c
 SRCS+= sparse_read.c
 
-VPATH+= ../libzipfile
-SRCS+= centraldir.c
-SRCS+= zipfile.c
-
 VPATH+= ../../extras/ext4_utils
 SRCS+= allocate.c
 SRCS+= contents.c
-SRCS+= crc16.c
 SRCS+= ext4_utils.c
 SRCS+= extent.c
 SRCS+= indirect.c
@@ -28,27 +29,44 @@ SRCS+= make_ext4fs.c
 SRCS+= sha1.c
 SRCS+= uuid.c
 SRCS+= wipe.c
+SRCS+= crc16.c
+SRCS+= ext4_sb.c
 
-VPATH+= ../../libselinux/src
+VPATH+= ../../extras/f2fs_utils
-SRCS+= callbacks.c
+SRCS+= f2fs_ioutils.c
-SRCS+= check_context.c
-SRCS+= freecon.c
-SRCS+= init.c
-SRCS+= label.c
-SRCS+= label_android_property.c
-SRCS+= label_file.c
 
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -D_GNU_SOURCE
+CPPFLAGS+= -D_XOPEN_SOURCE
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -DHAVE_OFF64_T
+CPPFLAGS+= -DHAVE_SYS_UIO_H
+CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 CPPFLAGS+= -I../libsparse/include
 CPPFLAGS+= -I../mkbootimg
 CPPFLAGS+= -I../../extras/ext4_utils
-CPPFLAGS+= -I../../libselinux/include
+CPPFLAGS+= -I../../extras/f2fs_utils
 
-LIBS+= -lz
+CFLAGS+= $(RPM_OPT_FLAGS) -std=gnu99
+LIBS= -lrt -lpthread -lz -lselinux
+LDFLAGS+= $(RPM_LD_FLAGS)
+
+CC= $(TOOLCHAIN)gcc
+LD= $(TOOLCHAIN)gcc
 
 OBJS= $(SRCS:.c=.o)
 
 all: fastboot
 
 fastboot: $(OBJS)
-	cc -o $@ $(OBJS) $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+
+install: fastboot
+	install fastboot $(DESTDIR)$(BINDIR)
+
+clean:
+	rm -rf $(OBJS)

android-tools-adb.service

@@ -0,0 +1,14 @@
+# Systemd unit file for adb
+
+[Unit]
+Description=Android Debug Bridge (adb) service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/adb start-server
+ExecStop=/usr/bin/adb kill-server
+PrivateTmp=yes
+Environment=HOME=/var/lib/adb
+
+[Install]
+WantedBy=multi-user.target

android-tools-autoupdate

@@ -1,13 +0,0 @@
-#!/bin/bash
-VERSION=$1
-git clone https://android.googlesource.com/platform/system/core -b android-$VERSION --depth=1 android-tools-$VERSION
-tar cJf android-tools-$VERSION.tar.xz android-tools-$VERSION
-rm -rf android-tools-$VERSION
-#
-git clone https://android.googlesource.com/platform/system/extras -b android-$VERSION --depth=1 android-tools-extras-$VERSION
-tar cJf android-tools-extras-$VERSION.tar.xz android-tools-extras-$VERSION
-rm -rf android-tools-extras-$VERSION
-#
-git clone https://android.googlesource.com/platform/external/libselinux -b android-$VERSION --depth=1 android-tools-external-libselinux-$VERSION
-tar cJf android-tools-external-libselinux-$VERSION.tar.xz android-tools-external-libselinux-$VERSION
-rm -rf android-tools-external-libselinux-$VERSION

android-tools.spec

@@ -1,5 +1,5 @@
 Name:          android-tools
-Version:       4.4.4_r2.0.1
+Version:       5.0.2_r1
 Release:       1mamba
 Summary:       Android platform tools
 Group:         System/Tools
@@ -7,21 +7,24 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://source.android.com
-Source:        android-tools-%{version}.tar.xz
+Source:        https://android.googlesource.com/platform/system/core.git/android-%{version}/core-%{version}.tar.bz2
-Source6:       android-tools-extras-%{version}.tar.xz
+Source6:       https://android.googlesource.com/platform/system/extras.git/android-%{version}/extras-%{version}.tar.bz2
-Source7:       android-tools-external-libselinux-%{version}.tar.xz
+# Following files come from: http://pkgs.fedoraproject.org/cgit/android-tools.git/plain/
-#Source:        android-src-system-%{version}.tar.xz
+Source1:       %{name}-rules
-Source1:       51-android.rules
+Source2:       %{name}-Makefile-core
-Source2:       core-Makefile
 Source3:       %{name}-Makefile-adb
 Source4:       %{name}-Makefile-fastboot
-Source5:       %{name}-autoupdate
+Source5:       android-tools-adb.service
+#Source5:       %{name}-autoupdate
+Patch0:        android-tools-5.0.2_r1-remove-selinux-header.patch
 License:       Apache License 2.0, BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libopenssl-devel
+BuildRequires: libselinux-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
+BuildRequires: libf2fs-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -46,18 +49,23 @@ mkbootims is a command line tool useful for creating kernel bootable images for
 This package also includes mkbootfs.
 
 %prep
-%setup -q -c -a6 -a7
+%setup -q -c -a6
-mv android-tools-%{version} core
+#-a7
-mv android-tools-extras-%{version} extras
+mv core-%{version} core
-mv android-tools-external-libselinux-%{version} libselinux
+mv extras-%{version} extras
-cd core
+
+cd extras
+%patch0 -p1
+
+cd ../core
+#mv android-tools-external-libselinux-%{version} libselinux
 cp -p %{S:2} Makefile
 cp -p %{S:3} adb/Makefile
 cp -p %{S:4} fastboot/Makefile
 
 %build
 cd core
-%make TOOLCHAIN=%{target_platform}
+%make -j1 TOOLCHAIN=%{_target_platform}-
 
 (cd libmincrypt
 %{_host}-gcc -c *.c -I../include
@@ -82,16 +90,32 @@ install -D -m0755 cpio/mkbootfs \
   %{buildroot}%{_bindir}/mkbootfs
 
 install -D -m0644 %{S:1} \
-  %{buildroot}%{_sysconfdir}/udev/rules.d/51-android.rules
+  %{buildroot}/lib/udev/rules.d/51-android.rules
+
+install -D -m0644 %{S:5} \
+  %{buildroot}%{_unitdir}/adb.service
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
+%post
+%systemd_post adb.service
+:
+
+%preun
+%systemd_preun adb.service
+:
+
+%postun
+%systemd_postun_with_restart adb.service
+:
+
 %files
 %defattr(-,root,root)
 %{_bindir}/adb
 %{_bindir}/fastboot
-%{_sysconfdir}/udev/rules.d/51-android.rules
+/lib/udev/rules.d/51-android.rules
+%{_unitdir}/adb.service
 %doc core/adb/*.TXT core/adb/NOTICE core/adb/*.txt
 
 %files -n mkbootimg
@@ -100,6 +124,9 @@ install -D -m0644 %{S:1} \
 %{_bindir}/mkbootfs
 
 %changelog
+* Tue Jan 20 2015 Automatic Build System <autodist@mambasoft.it> 5.0.2_r1-1mamba
+- automatic version update by autodist
+
 * Wed Aug 27 2014 Automatic Build System <autodist@mambasoft.it> 4.4.4_r2.0.1-1mamba
 - automatic version update by autodist