diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2011-12-13 09:16:07 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2011-12-13 09:16:07 +0000 |
| commit | 7fadc36b763c5015f287af421d7871e6956733ab (patch) | |
| tree | 6218d3d026eca8434c379edc6352e11eb294fcbc /main | |
| parent | f6497eb6a85c70359ec0705384ef310765d74e01 (diff) | |
| parent | 9b70ec32d12fb853a39d1612a75d96c1065c038b (diff) | |
| download | aports-7fadc36b763c5015f287af421d7871e6956733ab.tar.bz2 aports-7fadc36b763c5015f287af421d7871e6956733ab.tar.xz | |
Merge git://dev.alpinelinux.org/aports
Diffstat (limited to 'main')
35 files changed, 557 insertions, 66 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index bd879610b3..db6362ac99 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.8.8.0_rc4 +pkgver=1.8.8.0_rc5 pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -159,7 +159,7 @@ sound_en() { _move_dir var/lib/asterisk/sounds/en } -md5sums="5bd6239719370d491553a9a09f0d4dec asterisk-1.8.8.0-rc4.tar.gz +md5sums="737c309d970112b39c44ea246e4c9b21 asterisk-1.8.8.0-rc5.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD index 54ae183601..079ab8ccfc 100644 --- a/main/audacious-plugins/APKBUILD +++ b/main/audacious-plugins/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious-plugins -pkgver=3.1 -pkgrel=1 +pkgver=3.1.1 +pkgrel=0 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)" url="http://audacious-media-player.org/" arch="all" @@ -86,4 +86,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="46606131a9fd11d190b9a0181cc4ffa2 audacious-plugins-3.1.tar.gz" +md5sums="0491ff8561d556926f3080444735ce2f audacious-plugins-3.1.1.tar.gz" diff --git a/main/audacious/APKBUILD b/main/audacious/APKBUILD index ca3bbfc4e9..6b039d8fce 100644 --- a/main/audacious/APKBUILD +++ b/main/audacious/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious -pkgver=3.1 +pkgver=3.1.1 pkgrel=0 pkgdesc="playlist-oriented media player with multiple interfaces" url="http://audacious-media-player.org/" @@ -22,4 +22,4 @@ using plugin atheme-buildsys ac_enable_opt chardet -md5sums="a20fdf5d0348235e0a5e22c5aca69629 audacious-3.1.tar.gz" +md5sums="60e5452e8fdbe749529d8add07b0dbe8 audacious-3.1.1.tar.gz" diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD index 0b2717d627..4017199634 100644 --- a/main/binutils/APKBUILD +++ b/main/binutils/APKBUILD @@ -1,18 +1,34 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=binutils pkgver=2.22 -pkgrel=0 +pkgrel=1 pkgdesc="Tools necessary to build programs" url="http://www.gnu.org/software/binutils/" -source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2" depends= makedepends="bison flex texinfo zlib-dev" arch="all" license="GPL" subpackages="$pkgname-doc" +source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 + binutils-ld-fix-static-linking.patch" + +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch|*.diff) + msg "Applying $i..." + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --mandir /usr/share/man \ --build ${CHOST:-i486-alpine-linux-uclibc} \ @@ -35,4 +51,5 @@ package() { fi rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2" +md5sums="ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2 +6b744d0574338cc69d3096a890a7b609 binutils-ld-fix-static-linking.patch" diff --git a/main/binutils/binutils-ld-fix-static-linking.patch b/main/binutils/binutils-ld-fix-static-linking.patch new file mode 100644 index 0000000000..b192936af7 --- /dev/null +++ b/main/binutils/binutils-ld-fix-static-linking.patch @@ -0,0 +1,37 @@ +Index: binutils-2.22/ld/scripttempl/elf.sc +=================================================================== +--- binutils-2.22.orig/ld/scripttempl/elf.sc 2011-04-11 18:38:12.000000000 +0300 ++++ binutils-2.22/ld/scripttempl/elf.sc 2011-12-09 09:11:24.000000000 +0200 +@@ -225,8 +225,8 @@ + if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then + SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))" + SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))" +- CTORS_IN_INIT_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))" +- DTORS_IN_FINI_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))" ++ CTORS_IN_INIT_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors))" ++ DTORS_IN_FINI_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors))" + else + SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))" + SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))" +@@ -262,8 +262,7 @@ + doesn't matter which directory crtbegin.o + is in. */ + +- KEEP (*crtbegin.o(.ctors)) +- KEEP (*crtbegin?.o(.ctors)) ++ KEEP (*crtbegin*.o(.ctors)) + + /* We don't want to include the .ctor section from + the crtend.o file until after the sorted ctors. +@@ -278,9 +277,8 @@ + DTOR=".dtors ${CONSTRUCTING-0} : + { + ${CONSTRUCTING+${DTOR_START}} +- KEEP (*crtbegin.o(.dtors)) +- KEEP (*crtbegin?.o(.dtors)) +- KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors)) ++ KEEP (*crtbegin*.o(.dtors)) ++ KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + ${CONSTRUCTING+${DTOR_END}} diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD index 709b1b4b7d..fc98778b96 100644 --- a/main/cegui06/APKBUILD +++ b/main/cegui06/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cegui06 pkgver=0.6.2b -pkgrel=1 +pkgrel=2 pkgdesc="CEGUI library 0.6 for apps which need this specific version" url="http://www.cegui.org.uk" arch="all" @@ -14,7 +14,9 @@ install="" subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz cegui-0.6.2-gcc46.patch - cegui-0.6.0-userverso.patch" + cegui-0.6.0-release-as-so-ver.patch + cegui-0.6.0-userverso.patch + " _builddir="$srcdir"/CEGUI-0.6.2 prepare() { @@ -49,4 +51,5 @@ package() { md5sums="4fbd95e5a2ac1c7acf2a8f5df3ac6b93 CEGUI-0.6.2b.tar.gz c313bbb6fea733ff904f7f3b48f6a3d0 cegui-0.6.2-gcc46.patch +7a6c7f61d680344b4bfbf9766e3f2aad cegui-0.6.0-release-as-so-ver.patch dd5a5d6be594960cd53934271514e351 cegui-0.6.0-userverso.patch" diff --git a/main/cegui06/cegui-0.6.0-release-as-so-ver.patch b/main/cegui06/cegui-0.6.0-release-as-so-ver.patch new file mode 100644 index 0000000000..2c33ccfb7b --- /dev/null +++ b/main/cegui06/cegui-0.6.0-release-as-so-ver.patch @@ -0,0 +1,316 @@ +diff -up CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am +--- CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD + libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS + libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUICoronaImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUICoronaImageCodec_la_LIBADD = $(Corona_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am +--- CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -5,6 +5,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD + libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS + libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in +--- CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in.patch1 2008-11-30 21:11:37.000000000 +0100 ++++ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(Dev + + @MINGW32_BUILD_TRUE@libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am +--- CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD + libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS + libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in +--- CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in.patch1 2008-11-30 21:11:37.000000000 +0100 ++++ CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(Fre + + @MINGW32_BUILD_TRUE@libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am +--- CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD + libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS + libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in +--- CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in.patch1 2008-11-30 21:11:37.000000000 +0100 ++++ CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(SIL + + @MINGW32_BUILD_TRUE@libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am +--- CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im + if MINGW32_BUILD + libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS + libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + lib_LTLIBRARIES=libCEGUITGAImageCodec.la +diff -up CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in +--- CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in.patch1 2008-11-30 21:11:37.000000000 +0100 ++++ CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include + + @MINGW32_BUILD_TRUE@libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@ + + lib_LTLIBRARIES = libCEGUITGAImageCodec.la + libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp +diff -up CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am.patch1 CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am +--- CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am.patch1 2008-07-21 12:45:32.000000000 +0200 ++++ CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -23,7 +23,7 @@ endif + + libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) $(top_builddir)/src/libCEGUIBase.la + +-libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@ ++libCEGUIOpenGLRenderer_la_LDFLAGS += -release @PACKAGE_VERSION@ + + lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la + libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp +diff -up CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in.patch1 CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in +--- CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in.patch1 2008-11-30 21:11:37.000000000 +0100 ++++ CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-12-03 12:15:36.000000000 +0100 +@@ -250,7 +250,7 @@ xerces_LIBS = @xerces_LIBS@ + INCLUDES = $(am__append_1) -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS) + pkginclude_HEADERS = openglrenderer.h opengltexture.h + +-libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_OPENGL_VERSION_INFO@ ++libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE@libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS $(am__append_3) + +diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am +--- CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.patch1 2008-05-26 20:56:07.000000000 +0200 ++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -9,7 +9,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += - + libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version + endif + +-libCEGUILuaScriptModule_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ ++libCEGUILuaScriptModule_la_LDFLAGS += -release @PACKAGE_VERSION@ + + + lib_LTLIBRARIES = libCEGUILuaScriptModule.la +diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in +--- CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.patch1 2008-11-30 21:11:40.000000000 +0100 ++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -251,7 +251,7 @@ INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include\ + $(am__append_3) $(am__append_5) + +-libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@ ++libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@ + libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1) + + lib_LTLIBRARIES = libCEGUILuaScriptModule.la +diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am +--- CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am.patch1 2008-03-15 17:51:39.000000000 +0100 ++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -7,7 +7,7 @@ libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EX + libCEGUItoluapp_la_LDFLAGS += -no-undefined + endif + +-libCEGUItoluapp_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ ++libCEGUItoluapp_la_LDFLAGS += -release @PACKAGE_VERSION@ + + lib_LTLIBRARIES = libCEGUItoluapp.la + +diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in +--- CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in.patch1 2008-11-30 21:11:40.000000000 +0100 ++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -244,7 +244,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ + xerces_LIBS = @xerces_LIBS@ + INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ + +-libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ ++libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE@libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS + +diff -up CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am.patch1 CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am +--- CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -8,7 +8,7 @@ libCEGUIFalagardWRBase_la_CPPFLAGS = -DF + libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version + endif + +-libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ ++libCEGUIFalagardWRBase_la_LDFLAGS += -release @PACKAGE_VERSION@ + + libCEGUIFalagardWRBase_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in.patch1 CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in +--- CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in.patch1 2008-11-30 21:11:41.000000000 +0100 ++++ CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -246,7 +246,7 @@ INCLUDES = -I$(top_srcdir)/include \ + -I$(top_srcdir)/WindowRendererSets/Falagard/include + + +-libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ ++libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + + @MINGW32_BUILD_TRUE@libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS + +diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am +--- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am.patch1 2008-05-26 20:56:07.000000000 +0200 ++++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include + if MINGW32_BUILD + libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS + libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + lib_LTLIBRARIES=libCEGUITinyXMLParser.la +diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in +--- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in.patch1 2008-11-30 21:11:41.000000000 +0100 ++++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -253,6 +253,7 @@ INCLUDES = -I$(top_srcdir)/include $(am_ + + @MINGW32_BUILD_TRUE@libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + lib_LTLIBRARIES = libCEGUITinyXMLParser.la + libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la $(am__append_3) +diff -up CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am +--- CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(xer + if MINGW32_BUILD + libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS + libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in +--- CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in.patch1 2008-11-30 21:11:41.000000000 +0100 ++++ CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(xer + + @MINGW32_BUILD_TRUE@libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am +--- CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(exp + if MINGW32_BUILD + libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS + libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in +--- CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in.patch1 2008-11-30 21:11:41.000000000 +0100 ++++ CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(exp + + @MINGW32_BUILD_TRUE@libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am +--- CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am.patch1 2008-05-25 10:25:55.000000000 +0200 ++++ CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(lib + if MINGW32_BUILD + libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS + libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version ++else ++libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + endif + + libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la +diff -up CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in +--- CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in.patch1 2008-11-30 21:11:41.000000000 +0100 ++++ CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(lib + + @MINGW32_BUILD_TRUE@libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS + @MINGW32_BUILD_TRUE@libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version ++@MINGW32_BUILD_FALSE@libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@ + + libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la + +diff -up CEGUI-0.6.2/src/Makefile.am.patch1 CEGUI-0.6.2/src/Makefile.am +--- CEGUI-0.6.2/src/Makefile.am.patch1 2008-06-24 21:01:53.000000000 +0200 ++++ CEGUI-0.6.2/src/Makefile.am 2008-12-03 12:14:26.000000000 +0100 +@@ -9,7 +9,7 @@ libCEGUIBase_la_LDFLAGS += -shared -no-u + libCEGUIBase_la_LIBADD += -lwinmm + endif + +-libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@ ++libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@ + libCEGUIBase_la_LIBADD += $(freetype2_LIBS) $(pcre_LIBS) + + lib_LTLIBRARIES=libCEGUIBase.la +diff -up CEGUI-0.6.2/src/Makefile.in.patch1 CEGUI-0.6.2/src/Makefile.in +--- CEGUI-0.6.2/src/Makefile.in.patch1 2008-11-30 21:11:42.000000000 +0100 ++++ CEGUI-0.6.2/src/Makefile.in 2008-12-03 12:14:26.000000000 +0100 +@@ -247,7 +247,7 @@ xerces_CFLAGS = @xerces_CFLAGS@ + xerces_LIBS = @xerces_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS) $(am__append_3) + +-libCEGUIBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@ ++libCEGUIBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@ + libCEGUIBase_la_LIBADD = $(am__append_2) $(freetype2_LIBS) $(pcre_LIBS) + + @MINGW32_BUILD_TRUE@libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index fe6ac49da7..2299202a21 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kver=3.0.12 -_kpkgrel=1 +_kpkgrel=2 _mypkgrel=0 # verify the kernel version before entering chroot diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD index 2ca8b29e14..8dede7875a 100644 --- a/main/dahdi-tools/APKBUILD +++ b/main/dahdi-tools/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-tools pkgver=2.5.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Digium Asterisk Hardware Device Interface management utilities" url="http://www.asterisk.org" arch="all" license="GPL" -depends="dahdi-linux" +depends="" depends_dev="dahdi-linux-dev newt-dev" makedepends="dahdi-linux-dev perl newt-dev" install= diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD index 3a5877ad90..4050549114 100644 --- a/main/doxygen/APKBUILD +++ b/main/doxygen/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=doxygen -pkgver=1.7.5.1 +pkgver=1.7.6.1 pkgrel=0 pkgdesc="A documentation system for C++, C, Java, IDL and PHP" url="http://www.doxygen.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" MAN1DIR=share/man/man1 install } -md5sums="f5355c442c5bc2481dbef7fdea8f0556 doxygen-1.7.5.1.src.tar.gz" +md5sums="084f1db244b77b3abff335550ef8eec5 doxygen-1.7.6.1.src.tar.gz" diff --git a/main/libc0.9.32/STATUS b/main/libc0.9.32/STATUS index 10bea65325..fed3f38771 100644 --- a/main/libc0.9.32/STATUS +++ b/main/libc0.9.32/STATUS @@ -61,10 +61,6 @@ uclibc-eventfd.patch - Origin: External Patch with same effect is upstreamed. -uclibc-librt-asneeded-fix.patch - - Origin: Alpine - Upstreaming in progress. Not sure if upstream will take it. - uclibc-resolv-fix-memory-leak.patch - Origin: Upstream Nothing for us to do here. diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD new file mode 100644 index 0000000000..6a3c79ec03 --- /dev/null +++ b/main/libtxc_dxtn/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=0 +pkgdesc="S3TC texture decompression helper library" +url="http://dri.freedesktop.org/wiki/S3TC" +arch="all" +license="BSD" +depends="" +depends_dev="mesa-dev" +makedepends="$depends_dev automake autoconf libtool" +install="" +subpackages="$pkgname-dev" +source="http://cgit.freedesktop.org/~mareko/libtxc_dxtn/snapshot/libtxc_dxtn-$pkgver.tar.bz2" + +_builddir="$srcdir"/libtxc_dxtn-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + + sh autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make -j4 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/lib/libtxc_dxtn.la +} + +md5sums="63dc19246e1b8a5990be5ced66aff913 libtxc_dxtn-1.0.1.tar.bz2" diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD index c4b4d5a23a..215861b06a 100644 --- a/main/linux-firmware/APKBUILD +++ b/main/linux-firmware/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-firmware -pkgver=20110826 +pkgver=20111208 pkgrel=0 pkgdesc="firmware files for linux" url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" @@ -45,4 +45,4 @@ package() { mv "${_builddir}" ${pkgdir}/lib/firmware } -md5sums="3d881871622eb8c957d244060cd7f4a2 linux-firmware-20110826.tar.bz2" +md5sums="b8673160ebf2f7888c4044819efedf32 linux-firmware-20111208.tar.bz2" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 715cf00bed..82023d60ed 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.0.12 _kernver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -145,4 +145,4 @@ c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch 587b1fb2f6a5c9ba714900b856f57f09 kernelconfig.x86 -0b7758a8c0fc63cdaa53330ace7d8402 kernelconfig.x86_64" +99836ffe918bbdef7da1a56a3d075c7a kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index ef55302273..44fb3e04be 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -46,6 +46,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_64_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" @@ -323,7 +324,7 @@ CONFIG_GART_IOMMU=y # CONFIG_AMD_IOMMU is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y -# CONFIG_IOMMU_API is not set +CONFIG_IOMMU_API=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y @@ -495,7 +496,9 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_CNB20LE_QUIRK=y -# CONFIG_DMAR is not set +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y # CONFIG_INTR_REMAP is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m @@ -5089,6 +5092,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_PATH is not set +# CONFIG_INTEL_TXT is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set # CONFIG_IMA is not set diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index db1d412887..cb8a52d032 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpd -pkgver=0.16.5 -pkgrel=1 +pkgver=0.16.6 +pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" @@ -51,6 +51,6 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="f7564cff12035f6a1112cce770655df7 mpd-0.16.5.tar.bz2 +md5sums="5489dd327fba12c67f01558d2cfa6d57 mpd-0.16.6.tar.bz2 2ccbb38edc6dff5b5740760837f3005a mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 0ce4b70953..c3b5e7c661 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.5.18 +pkgver=5.5.19 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -187,6 +187,6 @@ bench() { mv "$pkgdir"/usr/share/sql-bench "$subpkgdir"/usr/share/ } -md5sums="38b65815249f3bcacf3b0ee85171c486 mysql-5.5.18.tar.gz +md5sums="a78cf450974e9202bd43674860349b5a mysql-5.5.19.tar.gz b2b038b1905fa5b80f6723d0ee2f811f mysql-prefer-dynamic-library.patch d46df8ab94cb5686862ff90c0a6bf707 mysql.initd" diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index 752d3a6d08..9d20e19a4d 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec _realname=open-iscsi _realver=2.0-872 _kver=3.0.12 -_kpkgrel=1 +_kpkgrel=2 # verify the kernel version before entering chroot if [ -f ../linux-${_flavor}/APKBUILD ]; then diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index f946dba427..9bad724447 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -7,7 +7,7 @@ _realver=2011.09.23 _realsubver=491607 _kver=3.0.12 -_kpkgrel=1 +_kpkgrel=2 # source open-vm-tools version if [ -f ../main/$_realname/APKBUILD ]; then diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD index 466628b6d8..7f96559a13 100644 --- a/main/openvpn/APKBUILD +++ b/main/openvpn/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openvpn pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="http://openvpn.sourceforge.net/" arch="all" @@ -9,7 +9,7 @@ license="custom" subpackages="$pkgname-doc $pkgname-easy-rsa:easy_rsa" depends="iproute2" makedepends="openssl-dev lzo-dev" -install= +install="$pkgname.pre-install" source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz openvpn.initd openvpn.confd diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install new file mode 100644 index 0000000000..e9c6a0d1ef --- /dev/null +++ b/main/openvpn/openvpn.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +addgroup -S openvpn 2>/dev/null +adduser -S -H -h /dev/null -s /bin/false -D -G openvpn openvpn 2>/dev/null +exit 0 diff --git a/main/perl-datetime-timezone/APKBUILD b/main/perl-datetime-timezone/APKBUILD index 89378d5919..ccf85b558d 100644 --- a/main/perl-datetime-timezone/APKBUILD +++ b/main/perl-datetime-timezone/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-datetime-timezone -pkgver=1.39 +pkgver=1.42 pkgrel=0 pkgdesc="DateTime::TimeZone perl module" url="http://search.cpan.org/dist/DateTime-TimeZone/" @@ -36,4 +36,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="00d9fa7d1e5f9e71c66a339c6995ff4f DateTime-TimeZone-1.39.tar.gz" +md5sums="e11c4f93eb1a9fcbd2cfab364335aa72 DateTime-TimeZone-1.42.tar.gz" diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD index 7d2cfcd1a9..0078fb4467 100644 --- a/main/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pidgin -pkgver=2.10.0 -pkgrel=4 +pkgver=2.10.1 +pkgrel=0 pkgdesc="graphical multi-protocol instant messaging client for X" url="http://pidgin.im/" arch="all" @@ -9,13 +9,22 @@ license="GPL" depends= makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev - cyrus-sasl-dev ncurses-dev nss-dev" + cyrus-sasl-dev ncurses-dev nss-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc finch libpurple $pkgname-lang" -source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2" +source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2 + pidgin-libm.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case "$i" in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize || return 1 + aclocal -I m4macros && autoconf && automake || return 1 } build() { @@ -60,4 +69,5 @@ libpurple() { mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ "$subpkgdir"/usr/share/ } -md5sums="e1453c9093c4f32beec19abd14069a3f pidgin-2.10.0.tar.bz2" +md5sums="eafb06b4083a201fe22d310e897a19dd pidgin-2.10.1.tar.bz2 +3cf0c3a476007781f4b0d855817cf58a pidgin-libm.patch" diff --git a/main/pidgin/pidgin-libm.patch b/main/pidgin/pidgin-libm.patch new file mode 100644 index 0000000000..f86e805723 --- /dev/null +++ b/main/pidgin/pidgin-libm.patch @@ -0,0 +1,10 @@ +--- ./pidgin/Makefile.am.orig ++++ ./pidgin/Makefile.am +@@ -148,6 +148,7 @@ + pidgin_DEPENDENCIES = @LIBOBJS@ + pidgin_LDFLAGS = -export-dynamic + pidgin_LDADD = \ ++ -lm \ + @LIBOBJS@ \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index 844f76f3c4..5a18e510c4 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql -pkgver=9.1.1 -pkgrel=2 +pkgver=9.1.2 +pkgrel=0 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" arch="all" @@ -57,7 +57,7 @@ client() { } -md5sums="061a9f17323117c9358ed60f33ecff78 postgresql-9.1.1.tar.bz2 +md5sums="7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2 7d7b7815f2bf133830f65ed9830ce461 postgresql.initd b609795f715cefcc30b08e4ed01f4416 postgresql.confd 5f6d10a6a3d71dcee856fa6671954ab4 pg-restore.initd diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 6485b99680..99b60bf9cc 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,16 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu pkgver=1.0 -pkgrel=1 +pkgrel=3 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" arch="all" license="GPL-2 LGPL-2" makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev - jpeg-dev libpng-dev vde2-dev spice-dev" + jpeg-dev libpng-dev vde2-dev spice-dev paxctl" depends= install="qemu.pre-install" subpackages=" +$pkgname-alpha $pkgname-arm $pkgname-cris $pkgname-i386 @@ -31,11 +32,14 @@ $pkgname-sh4eb $pkgname-sparc $pkgname-sparc64 $pkgname-x86_64 +$pkgname-xtensa +$pkgname-xtensaeb $pkgname-img " source="http://wiki.qemu.org/download/qemu-$pkgver.tar.gz 80-kvm.rules configure-libm.patch + librt.patch " prepare() { @@ -78,7 +82,8 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 install -Dm644 "$srcdir"/80-kvm.rules \ - "$pkgdir"/lib/udev/rules.d/80-kvm.rules + "$pkgdir"/lib/udev/rules.d/80-kvm.rules || return 1 + paxctl -c -m "$pkgdir"/usr/bin/qemu-system-* || return 1 } _subsys() { @@ -88,6 +93,7 @@ _subsys() { mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/ } +alpha() { _subsys alpha; } arm() { _subsys arm; } cris() { _subsys cris; } i386() { _subsys i386; } @@ -108,6 +114,8 @@ sh4eb() { _subsys sh4eb; } sparc() { _subsys sparc; } sparc64() { _subsys sparc64; } x86_64() { _subsys x86_64; } +xtensa() { _subsys xtensa; } +xtensaeb() { _subsys xtensaeb; } img() { pkgdesc="QEMU command line tool for manipulating disk images" @@ -116,8 +124,21 @@ img() { mv "$pkgdir"/usr/bin/qemu-img \ "$pkgdir"/usr/bin/qemu-io \ "$subpkgdir"/usr/bin/ + + # we exploit the fact that -img subpackage are craeted last + # and check that we done have new systems that belongs in + # subpackage + local _bins= _ret=0 + for i in "$pkgdir"/usr/bin/qemu-system-*; do + if [ -r "$i" ]; then + error "Please create a subpackage for ${i##*/}" + _ret=1 + fi + done + return $_err } md5sums="a64b36067a191451323b0d34ebb44954 qemu-1.0.tar.gz 66660f143235201249dc0648b39b86ee 80-kvm.rules -a69fe6ff552b61606c5550cac4294abc configure-libm.patch" +a69fe6ff552b61606c5550cac4294abc configure-libm.patch +9f6c3143d61748eedc8cf8d0e53aee2c librt.patch" diff --git a/main/qemu/librt.patch b/main/qemu/librt.patch new file mode 100644 index 0000000000..d445d1b68c --- /dev/null +++ b/main/qemu/librt.patch @@ -0,0 +1,11 @@ +--- ./Makefile.target.orig ++++ ./Makefile.target +@@ -34,7 +34,7 @@ + STPFILES= + + ifndef CONFIG_HAIKU +-LIBS+=-lm ++LIBS+=-lm -lrt + endif + + config-target.h: config-target.h-timestamp diff --git a/main/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD index c04a3c15af..c2e1eefa1c 100644 --- a/main/shorewall-shell/APKBUILD +++ b/main/shorewall-shell/APKBUILD @@ -2,7 +2,7 @@ pkgname=shorewall-shell _v=4.2.11 pkgver=4.2.11 -pkgrel=2 +pkgrel=3 pkgdesc="Shoreline Firewall shell-based compiler." url="http://www.shorewall.net/" arch="noarch" @@ -13,6 +13,7 @@ source="http://www.shorewall.net/pub/shorewall/${_v%.*}/shorewall-$_v/$pkgname-$ shorewall-policyrouting.patch shorewall-shell-ipset.patch shorewall-shell-providers-gateway-none.patch + shorewall-shell-rp_filter.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -33,4 +34,5 @@ build() { md5sums="518a7f389a6f606c109acb7dfbe18372 shorewall-shell-4.2.11.tar.bz2 64c01bc4f57203fb877bb334994eac38 shorewall-policyrouting.patch 79745ea284a08cb167b9a356ee0bff3b shorewall-shell-ipset.patch -66b7249c5c56d104f62676c175e222d3 shorewall-shell-providers-gateway-none.patch" +66b7249c5c56d104f62676c175e222d3 shorewall-shell-providers-gateway-none.patch +d5eadb6be45aa41f80669452baa853a6 shorewall-shell-rp_filter.patch" diff --git a/main/shorewall-shell/shorewall-shell-rp_filter.patch b/main/shorewall-shell/shorewall-shell-rp_filter.patch new file mode 100644 index 0000000000..0e3174c92c --- /dev/null +++ b/main/shorewall-shell/shorewall-shell-rp_filter.patch @@ -0,0 +1,17 @@ +--- ./compiler.orig ++++ ./compiler +@@ -3991,12 +3991,12 @@ + __EOF__ + done + +- save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter" +- + if [ "$ROUTE_FILTER" = yes ]; then + save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter" ++ save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter" + elif [ "$ROUTE_FILTER" = no ]; then + save_command "echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter" ++ save_command "echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter" + fi + + save_command "[ -n \"\$NOROUTES\" ] || ip route flush cache" diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD index 652bf808d6..9ea9d6a51d 100644 --- a/main/socat/APKBUILD +++ b/main/socat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=socat -pkgver=1.7.1.3 -pkgrel=1 +pkgver=1.7.2.0 +pkgrel=0 pkgdesc="Multipurpose relay for binary protocols" url="http://www.dest-unreach.org/socat/" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="2081987fb0cb0290b8105574058cb329 socat-1.7.1.3.tar.bz2" +md5sums="eb563dd00b9d39a49fb62a677fc941fe socat-1.7.2.0.tar.bz2" diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD index 82c5787aac..1fbad306ca 100644 --- a/main/spice/APKBUILD +++ b/main/spice/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=spice pkgver=0.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Implements the SPICE protocol" url="http://www.spice-space.org/" arch="all" diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index ae9942962e..2e4089656a 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion -pkgver=1.7.1 -pkgrel=1 +pkgver=1.7.2 +pkgrel=0 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" @@ -76,7 +76,7 @@ pl() { mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ } -md5sums="8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2 +md5sums="1e5dfffd27be080672e5a042564368a8 subversion-1.7.2.tar.bz2 e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch d084a7558053784886bc858b94fa9186 svnserve.confd c0327ac3f55c335db799a2269078f986 svnserve.initd" diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD index 2a5c14026f..ee30430e34 100644 --- a/main/tumbler/APKBUILD +++ b/main/tumbler/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tumbler -pkgver=0.1.22 -pkgrel=2 +pkgver=0.1.23 +pkgrel=0 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/apps/tumbler/" arch="all" @@ -41,4 +41,4 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="e7ba3b8f21f8f7e736f1e214906b4ca9 tumbler-0.1.22.tar.bz2" +md5sums="c6cf6821f5d884cbf2c26f45f2fecc74 tumbler-0.1.23.tar.bz2" diff --git a/main/upower/APKBUILD b/main/upower/APKBUILD index 97e1894d0f..3e187509b0 100644 --- a/main/upower/APKBUILD +++ b/main/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=upower -pkgver=0.9.14 +pkgver=0.9.15 pkgrel=0 pkgdesc="Power Management Services" url="http://upower.freedesktop.org" @@ -29,4 +29,4 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="18803f82102d56aac90949d1e4251645 upower-0.9.14.tar.xz" +md5sums="9503a853e894630e023ee244d295fd27 upower-0.9.15.tar.xz" diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 2f5dbc558f..62dd7d0e32 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -4,7 +4,7 @@ _realname=xtables-addons _name=$_realname-$_flavor _kver=3.0.12 -_kpkgrel=1 +_kpkgrel=2 # source the kernel version if [ -f ../linux-$_flavor/APKBUILD ]; then |