diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-04 22:03:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-04 22:03:40 +0100 |
| commit | a2c7fc5c3bf86996e9c30ce2a692dbf7a65d60de (patch) | |
| tree | a0b6522f136e050ae50c304d7ed2a37982664abb /package | |
| parent | 1b8b4b1839bb012877b8e98cc8932b4cf0349440 (diff) | |
| parent | f8a2963c529bd811e49693a0eaf3b1f19e90f1be (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
36 files changed, 806 insertions, 196 deletions
diff --git a/package/automake/Makefile b/package/automake/Makefile index b94044169..985db66da 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -1,39 +1,38 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= automake -PKG_VERSION:= 1.14.1 +PKG_VERSION:= 1.15 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 1.14 -PKG_HASH:= a9b4f04b8b69cac2e832a38a718943aa976dbdad0097211f8b3448afdacf0669 +PKG_HASH:= 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 PKG_DESCR:= tool for automatically generating makefiles PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host autoconf-host autoconf HOST_BUILDDEP:= autoconf-host PKG_URL:= http://www.gnu.org/software/automake/ -PKG_SITES:= ${MASTER_SITE_GNU:=automake/} +PKG_SITES:= $(MASTER_SITE_GNU:=automake/) PKG_OPTS:= noscripts -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call HOST_template,AUTOMAKE,automake,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,AUTOMAKE,automake,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) XAKE_FLAGS+= PERL="/usr/bin/perl" automake-install: - ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin - ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER} - ${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \ - ${IDIR_AUTOMAKE}/usr/share - ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER} - ${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \ - ${IDIR_AUTOMAKE}/usr/share + $(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/automake $(IDIR_AUTOMAKE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/aclocal $(IDIR_AUTOMAKE)/usr/bin + $(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/share/aclocal-$(PKG_VERSION) + $(CP) $(WRKINST)/usr/share/aclocal-$(PKG_VERSION) \ + $(IDIR_AUTOMAKE)/usr/share + $(INSTALL_DIR) $(IDIR_AUTOMAKE)/usr/share/automake-$(PKG_VERSION) + $(CP) $(WRKINST)/usr/share/automake-$(PKG_VERSION) \ + $(IDIR_AUTOMAKE)/usr/share -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 0ea1073f1..088a29397 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -28,7 +28,8 @@ BB_MAKE_FLAGS:= V=1 \ IPKG_ARCH="${ADK_TARGET_CPU_ARCH}" \ HOSTCC="${CC_FOR_BUILD}" \ HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ - CROSS_COMPILE="$(TARGET_CROSS)" + CROSS_COMPILE="$(TARGET_CROSS)" \ + SKIP_STRIP=y do-configure: # get all symbols from top level config diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index abd670592..bbbbfecc9 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -39,6 +39,7 @@ BIN_FILE:= bzip2-shared else BIN_FILE:= bzip2 endif + CONFIG_STYLE:= manual TARGET_CFLAGS+= -fPIC XAKE_FLAGS+= PREFIX=${WRKINST}/usr CROSS_COMPILE=1 @@ -52,6 +53,11 @@ bzip2-hostinstall: ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin $(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2 +do-install: + ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include + $(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include + $(CP) ${WRKBUILD}/libbz2.a ${STAGING_TARGET_DIR}/usr/lib + libbz2-install: ${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib $(CP) ${WRKBUILD}/libbz2.so* \ @@ -59,7 +65,6 @@ libbz2-install: $(CP) ${WRKBUILD}/libbz2.so* \ ${STAGING_TARGET_DIR}/usr/lib (cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) - $(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include ${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include $(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include diff --git a/package/cdrkit/Makefile b/package/cdrkit/Makefile new file mode 100644 index 000000000..45adc5712 --- /dev/null +++ b/package/cdrkit/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= cdrkit +PKG_VERSION:= 1.1.11 +PKG_RELEASE:= 1 +PKG_HASH:= d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da +PKG_DESCR:= cd burning kit +PKG_SECTION:= sys/hw +PKG_DEPENDS:= libmagic zlib libbz2 libcap +PKG_BUILDDEP:= cmake-host file zlib bzip2 libcap +PKG_SITES:= http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/ + +PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny + +DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CDRKIT,cdrkit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DUSE_LIBC_NLS=1 -DUSE_LIBXNET=0 -DUSE_LIBNLS=0 + +cdrkit-install: + $(INSTALL_DIR) $(IDIR_CDRKIT)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ + $(IDIR_CDRKIT)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/cdrkit/patches/patch-Makefile b/package/cdrkit/patches/patch-Makefile new file mode 100644 index 000000000..adf3bd7e2 --- /dev/null +++ b/package/cdrkit/patches/patch-Makefile @@ -0,0 +1,466 @@ +--- cdrkit-1.1.11.orig/Makefile 2007-05-06 12:23:54.000000000 +0200 ++++ cdrkit-1.1.11/Makefile 2015-02-25 10:54:08.000000000 +0100 +@@ -1,72 +1,409 @@ +-ifneq ($(CFLAGS),) +-CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_C_FLAGS="$(CFLAGS)" ) || exit 1; +-endif ++# CMAKE generated file: DO NOT EDIT! ++# Generated by "Unix Makefiles" Generator, CMake Version 3.1 + +-ifneq ($(LDFLAGS),) +-CMAKETWEAKS += (cd build ; cmake .. -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" ) || exit 1; +-endif ++# Default target executed when no arguments are given to make. ++default_target: all ++.PHONY : default_target + +-ifneq ($(PREFIX),) +-CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)") || exit 1; +-endif ++# Allow only one "make -f Makefile2" at a time, but pass parallelism. ++.NOTPARALLEL: ++.PHONY : .NOTPARALLEL + +-ifneq ($(MANSUBDIR),) +-CMAKETWEAKS += ( cd build ; cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; +-endif ++#============================================================================= ++# Special targets provided by cmake. + +-default_target: all ++# Disable implicit rules so canonical targets will work. ++.SUFFIXES: + +-DISTNAME=cdrkit-$(shell cat VERSION) +-DEBSRCNAME=cdrkit_$(shell cat VERSION | sed -e "s,pre,~pre,").orig.tar.gz ++# Remove some rules from gmake that .SUFFIXES does not remove. ++SUFFIXES = + +-build/Makefile: +- @-mkdir build 2>/dev/null +- cd build && cmake .. ++.SUFFIXES: .hpux_make_needs_suffix_list + +-cmakepurge: +- rm -rf install_manifest.txt progress.make CMakeFiles CMakeCache.txt cmake_install.cmake +- rm -rf */install_manifest.txt */progress.make */CMakeFiles */CMakeCache.txt */cmake_install.cmake +- rm -rf */*/install_manifest.txt */*/progress.make */*/CMakeFiles */*/CMakeCache.txt */*/cmake_install.cmake +- rm */Makefile */*/Makefile ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ ++# A target that is always out of date. ++cmake_force: ++.PHONY : cmake_force ++ ++#============================================================================= ++# Set environment variables for the build. ++ ++# The shell in which to execute make rules. ++SHELL = /bin/sh ++ ++# The CMake executable. ++CMAKE_COMMAND = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake ++ ++# The command to remove a file. ++RM = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f + ++# Escaping for special characters. ++EQUALS = = ++ ++# The top-level source directory on which CMake was run. ++CMAKE_SOURCE_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11 ++ ++# The top-level build directory on which CMake was run. ++CMAKE_BINARY_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11 ++ ++#============================================================================= ++# Targets provided globally by CMake. ++ ++# Special rule for the target install/strip ++install/strip: preinstall ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake ++.PHONY : install/strip ++ ++# Special rule for the target install/strip ++install/strip/fast: install/strip ++.PHONY : install/strip/fast ++ ++# Special rule for the target edit_cache ++edit_cache: ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) ++.PHONY : edit_cache ++ ++# Special rule for the target edit_cache ++edit_cache/fast: edit_cache ++.PHONY : edit_cache/fast ++ ++# Special rule for the target rebuild_cache ++rebuild_cache: ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) ++.PHONY : rebuild_cache ++ ++# Special rule for the target rebuild_cache ++rebuild_cache/fast: rebuild_cache ++.PHONY : rebuild_cache/fast ++ ++# Special rule for the target install ++install: preinstall ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake ++.PHONY : install ++ ++# Special rule for the target install ++install/fast: preinstall/fast ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -P cmake_install.cmake ++.PHONY : install/fast ++ ++# Special rule for the target list_install_components ++list_install_components: ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\"" ++.PHONY : list_install_components ++ ++# Special rule for the target list_install_components ++list_install_components/fast: list_install_components ++.PHONY : list_install_components/fast ++ ++# Special rule for the target install/local ++install/local: preinstall ++ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." ++ /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake ++.PHONY : install/local ++ ++# Special rule for the target install/local ++install/local/fast: install/local ++.PHONY : install/local/fast ++ ++# The main all target ++all: cmake_check_build_system ++ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles/progress.marks ++ $(MAKE) -f CMakeFiles/Makefile2 all ++ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles 0 ++.PHONY : all ++ ++# The main clean target + clean: +- rm -rf build ++ $(MAKE) -f CMakeFiles/Makefile2 clean ++.PHONY : clean + +-tarball: +-# if test "$(shell svn status | grep -v -i make)" ; then echo Uncommited files found. Run \"svn status\" to display them. ; exit 1 ; fi +- @if test -f ../$(DISTNAME).tar.gz ; then echo ../$(DISTNAME).tar.gz exists, not overwritting ; exit 1; fi +- -svn up +- rm -rf tmp +- mkdir tmp +- svn export . tmp/$(DISTNAME) +- rm -rf tmp/$(DISTNAME)/debian +- tar -f - -c -C tmp $(DISTNAME) | gzip -9 > ../$(DISTNAME).tar.gz +- rm -rf tmp +- test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../$(DEBSRCNAME) || true +- test -e ../tarballs && ln -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) || true ++# The main clean target ++clean/fast: clean ++.PHONY : clean/fast + +-tarball-remove: +- rm -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) ../$(DEBSRCNAME) ++# Prepare targets for installation. ++preinstall: all ++ $(MAKE) -f CMakeFiles/Makefile2 preinstall ++.PHONY : preinstall + +-SVNBASE=$(shell svn info | grep URL: | cut -f2 -d' ' | xargs dirname) +-release: tarball +- svn ci +- svn cp $(SVNBASE)/trunk $(SVNBASE)/tags/release_$(shell cat VERSION) ++# Prepare targets for installation. ++preinstall/fast: ++ $(MAKE) -f CMakeFiles/Makefile2 preinstall ++.PHONY : preinstall/fast + +-#%:: +-# $(MAKE) $(MAKE_FLAGS) build/Makefile +-# $(CMAKETWEAKS) +-# $(MAKE) -C build $(MAKE_FLAGS) $@ ++# clear depends ++depend: ++ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 ++.PHONY : depend + +-# needs to be explicite, for PHONY and install (AKA INSTALL) file on cygwin +-install: build/Makefile +- $(CMAKETWEAKS) +- $(MAKE) -C build $(MAKE_FLAGS) $@ ++#============================================================================= ++# Target rules for targets named devdump + +-all: build/Makefile +- $(CMAKETWEAKS) +- $(MAKE) -C build $(MAKE_FLAGS) $@ ++# Build rule for target. ++devdump: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 devdump ++.PHONY : devdump + +-.PHONY: install all ++# fast build rule for target. ++devdump/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/devdump.dir/build.make genisoimage/CMakeFiles/devdump.dir/build ++.PHONY : devdump/fast + ++#============================================================================= ++# Target rules for targets named genisoimage ++ ++# Build rule for target. ++genisoimage: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 genisoimage ++.PHONY : genisoimage ++ ++# fast build rule for target. ++genisoimage/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/genisoimage.dir/build.make genisoimage/CMakeFiles/genisoimage.dir/build ++.PHONY : genisoimage/fast ++ ++#============================================================================= ++# Target rules for targets named isodebug ++ ++# Build rule for target. ++isodebug: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 isodebug ++.PHONY : isodebug ++ ++# fast build rule for target. ++isodebug/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/isodebug.dir/build.make genisoimage/CMakeFiles/isodebug.dir/build ++.PHONY : isodebug/fast ++ ++#============================================================================= ++# Target rules for targets named isodump ++ ++# Build rule for target. ++isodump: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 isodump ++.PHONY : isodump ++ ++# fast build rule for target. ++isodump/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/isodump.dir/build.make genisoimage/CMakeFiles/isodump.dir/build ++.PHONY : isodump/fast ++ ++#============================================================================= ++# Target rules for targets named isoinfo ++ ++# Build rule for target. ++isoinfo: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 isoinfo ++.PHONY : isoinfo ++ ++# fast build rule for target. ++isoinfo/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/isoinfo.dir/build.make genisoimage/CMakeFiles/isoinfo.dir/build ++.PHONY : isoinfo/fast ++ ++#============================================================================= ++# Target rules for targets named isovfy ++ ++# Build rule for target. ++isovfy: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 isovfy ++.PHONY : isovfy ++ ++# fast build rule for target. ++isovfy/fast: ++ $(MAKE) -f genisoimage/CMakeFiles/isovfy.dir/build.make genisoimage/CMakeFiles/isovfy.dir/build ++.PHONY : isovfy/fast ++ ++#============================================================================= ++# Target rules for targets named wodim ++ ++# Build rule for target. ++wodim: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 wodim ++.PHONY : wodim ++ ++# fast build rule for target. ++wodim/fast: ++ $(MAKE) -f wodim/CMakeFiles/wodim.dir/build.make wodim/CMakeFiles/wodim.dir/build ++.PHONY : wodim/fast ++ ++#============================================================================= ++# Target rules for targets named wodimstuff ++ ++# Build rule for target. ++wodimstuff: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 wodimstuff ++.PHONY : wodimstuff ++ ++# fast build rule for target. ++wodimstuff/fast: ++ $(MAKE) -f wodim/CMakeFiles/wodimstuff.dir/build.make wodim/CMakeFiles/wodimstuff.dir/build ++.PHONY : wodimstuff/fast ++ ++#============================================================================= ++# Target rules for targets named edc ++ ++# Build rule for target. ++edc: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 edc ++.PHONY : edc ++ ++# fast build rule for target. ++edc/fast: ++ $(MAKE) -f libedc/CMakeFiles/edc.dir/build.make libedc/CMakeFiles/edc.dir/build ++.PHONY : edc/fast ++ ++#============================================================================= ++# Target rules for targets named hfs_iso ++ ++# Build rule for target. ++hfs_iso: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 hfs_iso ++.PHONY : hfs_iso ++ ++# fast build rule for target. ++hfs_iso/fast: ++ $(MAKE) -f libhfs_iso/CMakeFiles/hfs_iso.dir/build.make libhfs_iso/CMakeFiles/hfs_iso.dir/build ++.PHONY : hfs_iso/fast ++ ++#============================================================================= ++# Target rules for targets named paranoia ++ ++# Build rule for target. ++paranoia: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 paranoia ++.PHONY : paranoia ++ ++# fast build rule for target. ++paranoia/fast: ++ $(MAKE) -f libparanoia/CMakeFiles/paranoia.dir/build.make libparanoia/CMakeFiles/paranoia.dir/build ++.PHONY : paranoia/fast ++ ++#============================================================================= ++# Target rules for targets named icedax ++ ++# Build rule for target. ++icedax: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 icedax ++.PHONY : icedax ++ ++# fast build rule for target. ++icedax/fast: ++ $(MAKE) -f icedax/CMakeFiles/icedax.dir/build.make icedax/CMakeFiles/icedax.dir/build ++.PHONY : icedax/fast ++ ++#============================================================================= ++# Target rules for targets named usal ++ ++# Build rule for target. ++usal: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 usal ++.PHONY : usal ++ ++# fast build rule for target. ++usal/fast: ++ $(MAKE) -f libusal/CMakeFiles/usal.dir/build.make libusal/CMakeFiles/usal.dir/build ++.PHONY : usal/fast ++ ++#============================================================================= ++# Target rules for targets named rols ++ ++# Build rule for target. ++rols: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 rols ++.PHONY : rols ++ ++# fast build rule for target. ++rols/fast: ++ $(MAKE) -f librols/CMakeFiles/rols.dir/build.make librols/CMakeFiles/rols.dir/build ++.PHONY : rols/fast ++ ++#============================================================================= ++# Target rules for targets named unls ++ ++# Build rule for target. ++unls: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 unls ++.PHONY : unls ++ ++# fast build rule for target. ++unls/fast: ++ $(MAKE) -f libunls/CMakeFiles/unls.dir/build.make libunls/CMakeFiles/unls.dir/build ++.PHONY : unls/fast ++ ++#============================================================================= ++# Target rules for targets named readom ++ ++# Build rule for target. ++readom: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 readom ++.PHONY : readom ++ ++# fast build rule for target. ++readom/fast: ++ $(MAKE) -f readom/CMakeFiles/readom.dir/build.make readom/CMakeFiles/readom.dir/build ++.PHONY : readom/fast ++ ++#============================================================================= ++# Target rules for targets named netscsid ++ ++# Build rule for target. ++netscsid: cmake_check_build_system ++ $(MAKE) -f CMakeFiles/Makefile2 netscsid ++.PHONY : netscsid ++ ++# fast build rule for target. ++netscsid/fast: ++ $(MAKE) -f netscsid/CMakeFiles/netscsid.dir/build.make netscsid/CMakeFiles/netscsid.dir/build ++.PHONY : netscsid/fast ++ ++# Help Target ++help: ++ @echo "The following are some of the valid targets for this Makefile:" ++ @echo "... all (the default if no target is provided)" ++ @echo "... clean" ++ @echo "... depend" ++ @echo "... install/strip" ++ @echo "... edit_cache" ++ @echo "... rebuild_cache" ++ @echo "... install" ++ @echo "... list_install_components" ++ @echo "... install/local" ++ @echo "... isodebug" ++ @echo "... genisoimage" ++ @echo "... isodump" ++ @echo "... isoinfo" ++ @echo "... devdump" ++ @echo "... isovfy" ++ @echo "... wodimstuff" ++ @echo "... wodim" ++ @echo "... edc" ++ @echo "... hfs_iso" ++ @echo "... paranoia" ++ @echo "... icedax" ++ @echo "... usal" ++ @echo "... rols" ++ @echo "... unls" ++ @echo "... readom" ++ @echo "... netscsid" ++.PHONY : help ++ ++ ++ ++#============================================================================= ++# Special targets to cleanup operation of make. ++ ++# Special rule to run CMake to check the build system integrity. ++# No rule that depends on this can have commands that come from listfiles ++# because they might be regenerated. ++cmake_check_build_system: ++ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 ++.PHONY : cmake_check_build_system + diff --git a/package/cdrkit/patches/patch-include_xconfig_h_in b/package/cdrkit/patches/patch-include_xconfig_h_in new file mode 100644 index 000000000..789849362 --- /dev/null +++ b/package/cdrkit/patches/patch-include_xconfig_h_in @@ -0,0 +1,10 @@ +--- cdrkit-1.1.11.orig/include/xconfig.h.in 2006-12-02 12:10:05.000000000 +0100 ++++ cdrkit-1.1.11/include/xconfig.h.in 2015-02-21 21:20:01.000000000 +0100 +@@ -187,7 +187,6 @@ + * they are placed before the large file tests. + */ + +-#define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ + #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ + #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ + #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ diff --git a/package/cmake/Makefile b/package/cmake/Makefile index a96a33493..2008780b7 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cmake -PKG_VERSION:= 3.1.2 +PKG_VERSION:= 3.1.3 PKG_RELEASE:= 1 -PKG_HASH:= 2b210f7d867a1e716c1895357ebe63c7b9ae61fdb5f2d300ab2f01795f085b35 +PKG_HASH:= 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 PKG_DESCR:= build utility PKG_SECTION:= dev/tools PKG_URL:= http://www.cmake.org/ diff --git a/package/curl/Makefile b/package/curl/Makefile index 7f0cda615..055e8ff11 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.40.0 +PKG_VERSION:= 7.41.0 PKG_RELEASE:= 1 -PKG_HASH:= c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b +PKG_HASH:= 58c9f7cb1be9c26e6a2fd9326c14e054780dc4bb74b590a1d47fb3788a31535d PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 8745ed687..3d633aeb5 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.8 -PKG_RELEASE:= 2 -PKG_HASH:= f3abe96fa0793e63936725a4471429f070039a1e81e605deb378747194a50c47 +PKG_VERSION:= 2.0.9 +PKG_RELEASE:= 1 +PKG_HASH:= 8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/libcap/Makefile b/package/libcap/Makefile index c7227abf3..a0d982b14 100644 --- a/package/libcap/Makefile +++ b/package/libcap/Makefile @@ -4,25 +4,31 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libcap -PKG_VERSION:= 2.22 -PKG_RELEASE:= 3 +PKG_VERSION:= 2.24 +PKG_RELEASE:= 1 PKG_HASH:= 73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f PKG_DESCR:= capabilities library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= pam PKG_URL:= http://www.friedhoff.org/posixfilecaps.html -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +# for Darwin hosts CPPFLAGS_FOR_BUILD+= -I$(STAGING_TARGET_DIR)/usr/include CONFIG_STYLE:= manual +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ALL_TARGET:= static progs +INSTALL_TARGET:= install-static +else +ALL_TARGET:= shared progs +INSTALL_TARGET:= install-shared +endif + libcap-install: $(INSTALL_DIR) $(IDIR_LIBCAP)/usr/lib $(CP) $(WRKINST)/usr/lib/libcap*.so* \ diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules index 09f31b3b4..a6a637d3b 100644 --- a/package/libcap/patches/patch-Make_Rules +++ b/package/libcap/patches/patch-Make_Rules @@ -1,59 +1,61 @@ ---- libcap-2.22.orig/Make.Rules 2011-07-25 04:18:23.000000000 +0200 -+++ libcap-2.22/Make.Rules 2013-11-08 16:22:41.000000000 +0100 -@@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR) +--- libcap-2.24.orig/Make.Rules 2014-01-06 02:16:21.000000000 +0100 ++++ libcap-2.24/Make.Rules 2015-02-26 14:01:28.000000000 +0100 +@@ -12,22 +12,12 @@ FAKEROOT=$(DESTDIR) # These choices are motivated by the fact that getcap and setcap are # administrative operations that could be needed to recover a system. -ifndef lib --lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2) +-lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2) -endif - - ifdef prefix - exec_prefix=$(prefix) - lib_prefix=$(exec_prefix) -@@ -23,7 +19,7 @@ inc_prefix=$(lib_prefix) - man_prefix=$(prefix)/share - else +-ifdef prefix +-exec_prefix=$(prefix) +-lib_prefix=$(exec_prefix) +-inc_prefix=$(lib_prefix) +-man_prefix=$(prefix)/share +-else ++lib=lib prefix=/usr -exec_prefix= -+exec_prefix=/usr ++exec_prefix=$(prefix) lib_prefix=$(exec_prefix) inc_prefix=$(prefix) man_prefix=$(prefix)/share -@@ -34,7 +30,7 @@ endif - MANDIR=$(FAKEROOT)$(man_prefix)/man - SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin - INCDIR=$(FAKEROOT)$(inc_prefix)/include --LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib) -+LIBDIR=$(FAKEROOT)$(lib_prefix)/lib +-endif - # common defines for libcap - LIBTITLE=libcap -@@ -47,12 +43,13 @@ MINOR=22 - KERNEL_HEADERS := $(topdir)/libcap/include - IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) + # Target directories + +@@ -48,28 +38,28 @@ MINOR=24 + KERNEL_HEADERS := $(topdir)/libcap/include/uapi + IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include -CC := gcc -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +CC ?= gcc -+CFLAGS ?= -O2 -+CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 BUILD_CC := $(CC) BUILD_CFLAGS := $(CFLAGS) $(IPATH) -AR := ar -RANLIB := ranlib +-DEBUG = -g #-DDEBUG +AR ?= ar +RANLIB ?= ranlib - DEBUG = -g #-DDEBUG ++DEBUG = WARNINGS=-Wall -Wwrite-strings \ -Wpointer-arith -Wcast-qual -Wcast-align \ -@@ -64,11 +61,11 @@ LDFLAGS := #-g + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow +-LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g ++LD=$(CC) -shared ++LDFLAGS ?= #-g + SYSTEM_HEADERS = /usr/include INCS=$(topdir)/libcap/include/sys/capability.h LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CFLAGS += -Dlinux $(WARNINGS) - PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) +-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) ++PAM_CAP := no INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) -LIBATTR := yes diff --git a/package/libcap/patches/patch-Makefile b/package/libcap/patches/patch-Makefile new file mode 100644 index 000000000..8e2f8415b --- /dev/null +++ b/package/libcap/patches/patch-Makefile @@ -0,0 +1,25 @@ +--- libcap-2.24.orig/Makefile 2013-12-27 19:17:17.000000000 +0100 ++++ libcap-2.24/Makefile 2015-02-26 20:36:58.000000000 +0100 +@@ -16,6 +16,22 @@ endif + $(MAKE) -C progs $@ + $(MAKE) -C doc $@ + ++progs: ++ $(MAKE) -C progs all ++ ++shared: ++ $(MAKE) -C libcap shared ++ ++static: ++ $(MAKE) -C libcap static ++ ++install-shared: ++ $(MAKE) -C libcap install-shared ++ ++install-static: ++ $(MAKE) -C libcap install-static ++ ++ + all-here: + + install-here: diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile index f45b642c9..cf7703a43 100644 --- a/package/libcap/patches/patch-libcap_Makefile +++ b/package/libcap/patches/patch-libcap_Makefile @@ -1,7 +1,17 @@ ---- libcap-2.22.orig/libcap/Makefile 2010-08-09 00:26:04.000000000 +0200 -+++ libcap-2.22/libcap/Makefile 2013-10-28 10:46:10.000000000 +0100 -@@ -33,7 +33,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_ - endif +--- libcap-2.24.orig/libcap/Makefile 2014-01-06 01:55:03.000000000 +0100 ++++ libcap-2.24/libcap/Makefile 2015-02-26 20:34:47.000000000 +0100 +@@ -28,6 +28,9 @@ GPERF_OUTPUT = _caps_output.gperf + + all: $(MINLIBNAME) $(STALIBNAME) libcap.pc + ++static: $(STALIBNAME) ++shared: $(MINLIBNAME) ++ + ifeq ($(shell gperf --version > /dev/null 2>&1 && echo yes),yes) + USE_GPERF_OUTPUT = $(GPERF_OUTPUT) + INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) +@@ -43,7 +46,7 @@ libcap.pc: libcap.pc.in + $< >$@ _makenames: _makenames.c cap_names.list.h - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ @@ -9,3 +19,24 @@ cap_names.h: _makenames ./_makenames > cap_names.h +@@ -70,6 +73,20 @@ $(MINLIBNAME): $(OBJS) + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) + $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ + ++install-shared: install-headers ++ mkdir -p -m 0755 $(LIBDIR) ++ install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) ++ ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) ++ ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) ++ ++install-static: install-headers ++ mkdir -p -m 0755 $(LIBDIR) ++ install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME) ++ ++install-headers: ++ mkdir -p -m 0755 $(INCDIR)/sys ++ install -m 0644 include/sys/capability.h $(INCDIR)/sys ++ + install: all + mkdir -p -m 0755 $(INCDIR)/sys + install -m 0644 include/sys/capability.h $(INCDIR)/sys diff --git a/package/libcap/patches/patch-pam_cap_Makefile b/package/libcap/patches/patch-pam_cap_Makefile deleted file mode 100644 index 5608fece5..000000000 --- a/package/libcap/patches/patch-pam_cap_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- libcap-2.22.orig/pam_cap/Makefile 2010-08-09 02:08:01.000000000 +0200 -+++ libcap-2.22/pam_cap/Makefile 2013-11-08 16:29:05.000000000 +0100 -@@ -10,7 +10,6 @@ include ../Make.Rules - LDLIBS += -L../libcap -lcap - - all: pam_cap.so -- $(MAKE) testcompile - - install: all - mkdir -p -m 0755 $(LIBDIR)/security diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile index cb529907f..b3eb248c6 100644 --- a/package/ltrace/Makefile +++ b/package/ltrace/Makefile @@ -4,16 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltrace -PKG_VERSION:= 0.7.4 -# git from 24.05.2014 +PKG_VERSION:= c18a46eff706e956c4dc755144d752dc163a1145 PKG_RELEASE:= 1 -PKG_HASH:= 7fb662d3a918b96804a5c0a4b34c75985856e91079ddc89eca6dc87366834e3d PKG_DESCR:= intercepts and records dynamic library calls PKG_SECTION:= app/debug PKG_DEPENDS:= libelf PKG_BUILDDEP:= libelf PKG_URL:= http://ltrace.org/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= git://git.debian.org/git/collab-maint/ltrace.git include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/lvm/Makefile b/package/lvm/Makefile index df1957df6..ec3bc8439 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.114 +PKG_VERSION:= 2.02.116 PKG_RELEASE:= 1 -PKG_HASH:= de9cb0acfb9c5a6afa6184160c9e066f19043677f91a72c741d153efcd2874a5 +PKG_HASH:= 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 PKG_DESCR:= logical volume management PKG_SECTION:= sys/fs PKG_DEPENDS:= libdevmapper libncurses diff --git a/package/pam/Makefile b/package/pam/Makefile index 061c24d03..be3543b96 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -15,6 +15,8 @@ PKG_SITES:= http://www.linux-pam.org/library/ PKG_OPTS:= dev PKG_BB:= 1 +PKG_CFLINE_PAM:= depends on !ADK_TARGET_USE_STATIC_LIBS + DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION} diff --git a/package/php/Makefile b/package/php/Makefile index 81d75467b..deff3ef4d 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.6.3 -PKG_RELEASE:= 2 -PKG_HASH:= fad244506cc7f10fe56aba8129b3c39a4f9316d9544a4fba932c3f81fc2244b5 +PKG_VERSION:= 5.6.5 +PKG_RELEASE:= 1 +PKG_HASH:= c5ef4abaef8c1ea66dcfd5a075a2f357b666aff5c5b686fca7c78c1cfd64e996 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_DEPENDS:= libpthread librt diff --git a/package/samba/Makefile b/package/samba/Makefile index a96cfba26..c1f575b57 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.6.24 +PKG_VERSION:= 3.6.25 PKG_RELEASE:= 1 -PKG_HASH:= 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 +PKG_HASH:= 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 PKG_DESCR:= smb file and print server PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext-tiny util-linux popt diff --git a/package/sox/Makefile b/package/sox/Makefile index fd2a12b69..c0c15d79d 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sox -PKG_VERSION:= 14.4.1 -PKG_RELEASE:= 2 -PKG_HASH:= 9a8c2c6fe51e608da346a157e111508a957af9e3ecf3de26781d36e9a67fa89b +PKG_VERSION:= 14.4.2 +PKG_RELEASE:= 1 +PKG_HASH:= b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c PKG_DESCR:= swiss army knife of sound processing programs PKG_SECTION:= mm/audio PKG_BUILDDEP:= zlib ncurses diff --git a/package/squid/Makefile b/package/squid/Makefile index 5edc3057b..9d6f70d49 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.4.6 +PKG_VERSION:= 3.5.2 PKG_RELEASE:= 1 -PKG_HASH:= 9ef26cd638c65afa750637b3669057c052890f10c686eb0218eb0d39b4199bc0 +PKG_HASH:= 5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy -PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl -PKG_BUILDDEP:= openssl libtool +PKG_DEPENDS:= libpthread libstdcxx libltdl +PKG_BUILDDEP:= libtool PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/ +PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.5/ PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE @@ -147,7 +147,6 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --disable-debug-cbdata \ --enable-kill-parent-hack \ --enable-arp-acl \ - --enable-ssl \ --enable-err-languages=English \ --enable-default-err-language=English \ --enable-linux-netfilter \ @@ -159,11 +158,11 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --without-libcap \ --disable-snmp \ --disable-esi \ + --disable-ssl \ --disable-htcp \ --disable-wccp \ --disable-wccpv2 \ --enable-useragent-log \ - --with-openssl=${STAGING_TARGET_DIR}/usr \ --without-krb5-config \ --enable-negotiate-auth-helpers=no \ --enable-auth \ diff --git a/package/squid/patches/patch-acinclude_lib-checks_m4 b/package/squid/patches/patch-acinclude_lib-checks_m4 deleted file mode 100644 index b44b4eb27..000000000 --- a/package/squid/patches/patch-acinclude_lib-checks_m4 +++ /dev/null @@ -1,72 +0,0 @@ ---- squid-3.4.4.orig/acinclude/lib-checks.m4 2014-03-09 10:40:56.000000000 +0100 -+++ squid-3.4.4/acinclude/lib-checks.m4 2014-03-11 19:44:28.088928982 +0100 -@@ -95,69 +95,6 @@ AC_DEFUN([SQUID_CHECK_LIBIPHLPAPI],[ - SQUID_STATE_ROLLBACK(iphlpapi) - ]) - --dnl Checks whether the OpenSSL SSL_get_certificate crashes squid and if a --dnl workaround can be used instead of using the SSL_get_certificate --AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ -- AH_TEMPLATE(SQUID_SSLGETCERTIFICATE_BUGGY, "Define to 1 if the SSL_get_certificate crashes squid") -- AH_TEMPLATE(SQUID_USE_SSLGETCERTIFICATE_HACK, "Define to 1 to use squid workaround for SSL_get_certificate") -- SQUID_STATE_SAVE(check_SSL_get_certificate) -- LIBS="$SSLLIB $LIBS" -- if test "x$SSLLIBDIR" != "x"; then -- LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR" -- fi -- -- AC_MSG_CHECKING(whether the SSL_get_certificate is buggy) -- AC_RUN_IFELSE([ -- AC_LANG_PROGRAM( -- [ -- #include <openssl/ssl.h> -- #include <openssl/err.h> -- ], -- [ -- SSLeay_add_ssl_algorithms(); -- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method()); -- SSL *ssl = SSL_new(sslContext); -- X509* cert = SSL_get_certificate(ssl); -- return 0; -- ]) -- ], -- [ -- AC_MSG_RESULT([no]) -- ], -- [ -- AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1) -- AC_MSG_RESULT([yes]) -- ], -- []) -- -- AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works) -- AC_RUN_IFELSE([ -- AC_LANG_PROGRAM( -- [ -- #include <openssl/ssl.h> -- #include <openssl/err.h> -- ], -- [ -- SSLeay_add_ssl_algorithms(); -- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method()); -- X509 ***pCert = (X509 ***)sslContext->cert; -- X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1; -- if (sslCtxCert != NULL) -- return 1; -- return 0; -- ]) -- ], -- [ -- AC_MSG_RESULT([yes]) -- AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 1) -- ], -- [ -- AC_MSG_RESULT([no]) -- ], --[]) -- --SQUID_STATE_ROLLBACK(check_SSL_get_certificate) --]) - - dnl Checks whether the SSL_CTX_new and similar functions require - dnl a const 'SSL_METHOD *' argument diff --git a/package/squid/patches/patch-configure_ac b/package/squid/patches/patch-configure_ac new file mode 100644 index 000000000..0aae95639 --- /dev/null +++ b/package/squid/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- squid-3.5.2.orig/configure.ac 2015-02-18 06:18:57.000000000 -0600 ++++ squid-3.5.2/configure.ac 2015-02-20 13:01:31.755039271 -0600 +@@ -1343,7 +1343,7 @@ if test "x$with_openssl" = "xyes"; then + AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available]) + + # check for other specific broken implementations +- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS ++ #SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS + SQUID_CHECK_OPENSSL_CONST_SSL_METHOD + SQUID_CHECK_OPENSSL_TXTDB + SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK diff --git a/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c b/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c index 32faad55f..17fd993a7 100644 --- a/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c +++ b/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c @@ -1,11 +1,11 @@ ---- squid-3.4.4.orig/lib/rfcnb/rfcnb-io.c 2014-03-09 10:40:56.000000000 +0100 -+++ squid-3.4.4/lib/rfcnb/rfcnb-io.c 2014-03-27 09:28:30.000000000 +0100 -@@ -30,7 +30,7 @@ - #include "rfcnb/rfcnb-util.h" - #include "rfcnb/std-includes.h" +--- squid-3.5.2.orig/lib/rfcnb/rfcnb-io.c 2015-02-18 06:17:02.000000000 -0600 ++++ squid-3.5.2/lib/rfcnb/rfcnb-io.c 2015-02-20 00:33:21.015450265 -0600 +@@ -40,7 +40,7 @@ + #include <string.h> + #endif #include <sys/uio.h> -#include <sys/signal.h> +#include <signal.h> - #if HAVE_STRING_H - #include <string.h> + int RFCNB_Timeout = 0; /* Timeout in seconds ... */ + diff --git a/package/squid/patches/patch-libltdl_aclocal_m4 b/package/squid/patches/patch-libltdl_aclocal_m4 new file mode 100644 index 000000000..45b9c7e64 --- /dev/null +++ b/package/squid/patches/patch-libltdl_aclocal_m4 @@ -0,0 +1,14 @@ +--- squid-3.5.2.orig/libltdl/aclocal.m4 2015-02-18 06:17:49.000000000 -0600 ++++ squid-3.5.2/libltdl/aclocal.m4 2015-02-23 15:31:16.264583929 -0600 +@@ -486,9 +486,9 @@ _AM_IF_OPTION([no-define],, + # Some tools Automake needs. + AC_REQUIRE([AM_SANITY_CHECK])dnl + AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) ++AM_MISSING_PROG([ACLOCAL], [aclocal]) + AM_MISSING_PROG([AUTOCONF], [autoconf]) +-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) ++AM_MISSING_PROG([AUTOMAKE], [automake]) + AM_MISSING_PROG([AUTOHEADER], [autoheader]) + AM_MISSING_PROG([MAKEINFO], [makeinfo]) + AC_REQUIRE([AM_PROG_INSTALL_SH])dnl diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am index 9aec4eca3..049ff3a1d 100644 --- a/package/squid/patches/patch-src_Makefile_am +++ b/package/squid/patches/patch-src_Makefile_am @@ -1,11 +1,11 @@ ---- squid-3.4.4.orig/src/Makefile.am 2014-03-09 10:40:56.000000000 +0100 -+++ squid-3.4.4/src/Makefile.am 2014-03-12 09:46:23.001434141 +0100 -@@ -981,7 +981,7 @@ cache_cf.o: cf_parser.cci +--- squid-3.5.2.orig/src/Makefile.am 2015-02-18 06:17:02.000000000 -0600 ++++ squid-3.5.2/src/Makefile.am 2015-02-23 15:32:32.084583233 -0600 +@@ -970,7 +970,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci -- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src -+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src +- $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src # squid.conf.default is built by cf_gen when making cf_parser.cci squid.conf.default squid.conf.documented: cf_parser.cci diff --git a/package/u-boot/files/fw_env.config b/package/u-boot/files/fw_env.config new file mode 100644 index 000000000..5571d60e0 --- /dev/null +++ b/package/u-boot/files/fw_env.config @@ -0,0 +1 @@ +/mnt/uboot.env 0x0000 0x4000 diff --git a/package/u-boot/files/uboot_print_env b/package/u-boot/files/uboot_print_env new file mode 100755 index 000000000..7231e1a47 --- /dev/null +++ b/package/u-boot/files/uboot_print_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount -r /dev/mmcblk0p1 /mnt +fw_printenv "$@" +umount /mnt diff --git a/package/u-boot/files/uboot_set_env b/package/u-boot/files/uboot_set_env new file mode 100755 index 000000000..7b5a33ccc --- /dev/null +++ b/package/u-boot/files/uboot_set_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount /dev/mmcblk0p1 /mnt +fw_setenv "$@" +umount /mnt diff --git a/package/u-boot/patches/patch-arch_arm_lib_bootm_c b/package/u-boot/patches/patch-arch_arm_lib_bootm_c new file mode 100644 index 000000000..1498f47dd --- /dev/null +++ b/package/u-boot/patches/patch-arch_arm_lib_bootm_c @@ -0,0 +1,13 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/arch/arm/lib/bootm.c 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/arch/arm/lib/bootm.c 2015-01-07 18:11:45.971158851 +0100 +@@ -70,8 +70,8 @@ void arch_lmb_reserve(struct lmb *lmb) + */ + static void announce_and_cleanup(int fake) + { +- printf("\nStarting kernel ...%s\n\n", fake ? +- "(fake run for tracing)" : ""); ++ //printf("\nStarting kernel ...%s\n\n", fake ? ++ // "(fake run for tracing)" : ""); + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); + #ifdef CONFIG_BOOTSTAGE_FDT + bootstage_fdt_add_report(); diff --git a/package/u-boot/patches/patch-common_cmd_bootmenu_c b/package/u-boot/patches/patch-common_cmd_bootmenu_c new file mode 100644 index 000000000..ac0d02916 --- /dev/null +++ b/package/u-boot/patches/patch-common_cmd_bootmenu_c @@ -0,0 +1,11 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/common/cmd_bootmenu.c 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/common/cmd_bootmenu.c 2015-01-07 17:51:11.947152887 +0100 +@@ -423,7 +423,7 @@ cleanup: + } + + if (title && command) { +- debug("Starting entry '%s'\n", title); ++ //debug("Starting entry '%s'\n", title); + free(title); + run_command(command, 0); + free(command); diff --git a/package/u-boot/patches/patch-include_configs_rpi_h b/package/u-boot/patches/patch-include_configs_rpi_h new file mode 100644 index 000000000..13774f2d2 --- /dev/null +++ b/package/u-boot/patches/patch-include_configs_rpi_h @@ -0,0 +1,44 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/include/configs/rpi.h 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/include/configs/rpi.h 2015-01-07 18:05:13.563156954 +0100 +@@ -19,6 +19,8 @@ + + #include <linux/sizes.h> + ++#undef DEBUG ++ + /* Architecture, CPU, etc.*/ + #define CONFIG_SYS_GENERIC_BOARD + #define CONFIG_BCM2835 +@@ -96,7 +98,7 @@ + /* Console UART */ + #define CONFIG_PL01X_SERIAL + #define CONFIG_CONS_INDEX 0 +-#define CONFIG_BAUDRATE 115200 ++#define CONFIG_BAUDRATE 9600 + + /* Console configuration */ + #define CONFIG_SYS_CBSIZE 1024 +@@ -117,7 +119,7 @@ + + /* Shell */ + #define CONFIG_SYS_MAXARGS 8 +-#define CONFIG_SYS_PROMPT "U-Boot> " ++#define CONFIG_SYS_PROMPT "CONET-Boot> " + #define CONFIG_COMMAND_HISTORY + + /* Commands */ +@@ -185,9 +187,12 @@ + + #define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_DEVICE_SETTINGS \ +- ENV_MEM_LAYOUT_SETTINGS \ +- BOOTENV ++ ENV_MEM_LAYOUT_SETTINGS + + #define CONFIG_BOOTDELAY 2 ++#define CONFIG_CMD_BOOTMENU ++#define CONFIG_MENU ++#define CONFIG_AUTOBOOT_KEYED ++#define CONFIG_MENU_SHOW + + #endif diff --git a/package/u-boot/patches/patch-include_env_default_h b/package/u-boot/patches/patch-include_env_default_h new file mode 100644 index 000000000..2a03dfb31 --- /dev/null +++ b/package/u-boot/patches/patch-include_env_default_h @@ -0,0 +1,11 @@ +--- u-boot-2015.01.orig/include/env_default.h 2015-01-12 15:39:08.000000000 +0100 ++++ u-boot-2015.01/include/env_default.h 2015-02-16 10:23:23.123639584 +0100 +@@ -8,6 +8,8 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + ++#include <generated/autoconf.h> ++ + #include <env_callback.h> + + #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED diff --git a/package/u-boot/patches/patch-tools_env_fw_env_h b/package/u-boot/patches/patch-tools_env_fw_env_h new file mode 100644 index 000000000..53548351f --- /dev/null +++ b/package/u-boot/patches/patch-tools_env_fw_env_h @@ -0,0 +1,11 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/tools/env/fw_env.h 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/tools/env/fw_env.h 2015-01-07 13:13:44.399072426 +0100 +@@ -14,6 +14,8 @@ + #include <config.h> + #endif + ++#include <generated/autoconf.h> ++ + /* + * To build the utility with the static configuration + * comment out the next line. diff --git a/package/xterm/Makefile b/package/xterm/Makefile index 37043fc3e..db4e53003 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 306 +PKG_VERSION:= 314 PKG_RELEASE:= 1 -PKG_HASH:= 6a09f60d126603604d0c801e3f5000e4af87b309e8e1d3c0735be50b6d13bdaa +PKG_HASH:= 1dbf1e93796c1b71b22b84e82eb58bcf20a14a7f365158819f3b4dbb29fe93f0 PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig diff --git a/package/xterm/patches/patch-xterm_h b/package/xterm/patches/patch-xterm_h deleted file mode 100644 index 7a3418a11..000000000 --- a/package/xterm/patches/patch-xterm_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xterm-297.orig/xterm.h 2013-09-10 12:55:04.000000000 +0200 -+++ xterm-297/xterm.h 2013-10-30 17:19:53.000000000 +0100 -@@ -99,7 +99,7 @@ - #define HAVE_PUTENV 1 - #endif - --#if defined(CSRG_BASED) || defined(__GNU__) -+#if defined(CSRG_BASED) || defined(__linux__) - #define USE_POSIX_TERMIOS 1 - #endif - |