summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/cairo/APKBUILD15
-rw-r--r--main/e2fsprogs/0001-implement-com_right_r.patch59
-rw-r--r--main/e2fsprogs/APKBUILD26
-rw-r--r--main/feh/APKBUILD14
-rw-r--r--main/heimdal/100-check-com_err-pthread.patch11
-rw-r--r--main/heimdal/APKBUILD8
-rw-r--r--main/imagemagick/APKBUILD2
-rw-r--r--main/imlib2/APKBUILD16
-rw-r--r--main/lsof/APKBUILD23
-rw-r--r--main/nmap/APKBUILD3
-rw-r--r--main/pciutils/APKBUILD4
-rw-r--r--main/samba/APKBUILD4
-rw-r--r--main/slim/APKBUILD6
-rw-r--r--main/zlib/APKBUILD7
14 files changed, 158 insertions, 40 deletions
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 4e2183a0e..8bd0adc4b 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cairo
pkgver=1.8.8
-pkgrel=0
+pkgrel=1
pkgdesc="Cairo vector graphics library"
url="http://cairographics.org/"
license="LGPL MPL"
@@ -14,15 +14,20 @@ depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev
xcb-util-dev"
source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz"
-build ()
-{
- cd ""$srcdir"/$pkgname-$pkgver"
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+ cd "$_builddir"
+ sed -i -e 's/libpng13/libpng14/g' configure || return 1
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-xcb \
--disable-static || return 1
make || return 1
- make DESTDIR=""$pkgdir"" install || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
}
md5sums="d3e1a1035ae563812d4dd44a74fb0dd0 cairo-1.8.8.tar.gz"
diff --git a/main/e2fsprogs/0001-implement-com_right_r.patch b/main/e2fsprogs/0001-implement-com_right_r.patch
new file mode 100644
index 000000000..dc285d9ac
--- /dev/null
+++ b/main/e2fsprogs/0001-implement-com_right_r.patch
@@ -0,0 +1,59 @@
+From 527d258d605e5a1dd841bccc6091c0b894a10411 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 27 Jan 2010 16:02:08 +0000
+Subject: [PATCH] implement com_right_r()
+
+For heimdal compat
+---
+ lib/et/com_err.h | 2 ++
+ lib/et/com_right.c | 14 ++++++++++++++
+ 2 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/lib/et/com_err.h b/lib/et/com_err.h
+index de0146e..eb2106f 100644
+--- a/lib/et/com_err.h
++++ b/lib/et/com_err.h
+@@ -16,6 +16,7 @@
+ #define COM_ERR_ATTR(x)
+ #endif
+
++#include <stddef.h>
+ #include <stdarg.h>
+
+ typedef long errcode_t;
+@@ -49,6 +50,7 @@ extern void add_to_error_table(struct et_list *new_table);
+
+ /* Provided for Heimdall compatibility */
+ extern const char *com_right(struct et_list *list, long code);
++extern const char *com_right_r(struct et_list *list, long code, char *str, size_t len);
+ extern void initialize_error_table_r(struct et_list **list,
+ const char **messages,
+ int num_errors,
+diff --git a/lib/et/com_right.c b/lib/et/com_right.c
+index 173fd1a..dbc1e41 100644
+--- a/lib/et/com_right.c
++++ b/lib/et/com_right.c
+@@ -55,6 +55,20 @@ com_right(struct et_list *list, long code)
+ return NULL;
+ }
+
++const char *
++com_right_r(struct et_list *list, long code, char *str, size_t len)
++{
++ struct et_list *p;
++ for (p = list; p; p = p->next) {
++ if (code >= p->table->base && code < p->table->base + p->table->n_msgs) {
++ strlcpy(str, p->table->msgs[code - p->table->base], len);
++ return str;
++ }
++ }
++ return NULL;
++}
++
++
+ struct foobar {
+ struct et_list etl;
+ struct error_table tab;
+--
+1.6.6.1
+
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 440cad5e6..ebd98c794 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.41.9
-pkgrel=0
+pkgrel=3
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
license="GPL LGPL MIT"
@@ -9,12 +9,19 @@ depends=
install="$pkgname.post-upgrade"
makedepends="util-linux-ng-dev pkgconfig"
subpackages="$pkgname-dev $pkgname-doc libcom_err"
-source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz
+ 0001-implement-com_right_r.patch"
depends_dev="util-linux-ng-dev"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ patch -p1 -i "$srcdir"/0001-implement-com_right_r.patch
+}
+
build () {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "$_builddir"
./configure \
--mandir=/usr/share/man \
--enable-elf-shlibs \
@@ -26,13 +33,20 @@ build () {
--disable-nls
make || return 1
- make LDCONFIG=: DESTDIR=${pkgdir} install install-libs || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make LDCONFIG=: DESTDIR="${pkgdir}" install install-libs || return 1
}
libcom_err() {
depends=
- mkdir -p "$subpkgdir"/lib
+ replaces="e2fsprogs"
+ mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/libcom_err* "$subpkgdir"/usr/lib/
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-md5sums="52f60a9e19a02f142f5546f1b5681927 e2fsprogs-1.41.9.tar.gz"
+md5sums="52f60a9e19a02f142f5546f1b5681927 e2fsprogs-1.41.9.tar.gz
+600bedf9a85cd197c39715b0be5cc5f7 0001-implement-com_right_r.patch"
diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD
index a609b8d99..a4c679b7e 100644
--- a/main/feh/APKBUILD
+++ b/main/feh/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=feh
pkgver=1.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
url="http://www.linuxbrit.co.uk/feh/"
license="MIT"
@@ -10,13 +10,17 @@ depends=
makedepends="libxt-dev libpng-dev giblib-dev imlib2-dev jpeg-dev"
source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
-build ()
-{
- cd $srcdir/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--mandir=/usr/share/man || return 1
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
md5sums="3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz"
diff --git a/main/heimdal/100-check-com_err-pthread.patch b/main/heimdal/100-check-com_err-pthread.patch
new file mode 100644
index 000000000..f2a4b637b
--- /dev/null
+++ b/main/heimdal/100-check-com_err-pthread.patch
@@ -0,0 +1,11 @@
+--- heimdal-1.3.1/cf/check-compile-et.m4.orig
++++ heimdal-1.3.1/cf/check-compile-et.m4
+@@ -61,7 +61,7 @@
+ elif test "${krb_cv_compile_et}" = "yes"; then
+ dnl Since compile_et seems to work, let's check libcom_err
+ krb_cv_save_LIBS="${LIBS}"
+- LIBS="${LIBS} -lcom_err"
++ LIBS="${LIBS} -lcom_err -lpthread"
+ AC_MSG_CHECKING(for com_err)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <com_err.h>]],[[
+ const char *p;
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 03f7c72e7..911b05f00 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,12 +2,12 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
pkgname=heimdal
pkgver=1.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="An implementation of Kerberos 5"
url="http://www.h5l.org/"
license="BSD"
depends=
-makedepends="gawk readline-dev e2fsprogs-dev sqlite-dev autoconf automake
+makedepends="gawk readline-dev e2fsprogs-dev>=1.41.9-r2 sqlite-dev autoconf automake
libtool pkgconfig"
install=
subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
@@ -19,6 +19,7 @@ source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz
005_all_heimdal-suid_fix.patch
013_all_heimdal-pthread-lib.patch
014_all_heimdal-path.patch
+100-check-com_err-pthread.patch
heimdal-c++-safe-krb5_cccol_cursor.patch
heimdal-locate_plugin-header.patch
"
@@ -37,6 +38,7 @@ prepare() {
patch -Np0 -i ../005_all_heimdal-suid_fix.patch || return 1
patch -Np1 -i ../013_all_heimdal-pthread-lib.patch || return 1
patch -Np0 -i ../014_all_heimdal-path.patch || return 1
+ patch -Np1 -i ../100-check-com_err-pthread.patch || return 1
patch -Np1 -i ../heimdal-c++-safe-krb5_cccol_cursor.patch || return 1
patch -Np1 -i ../heimdal-locate_plugin-header.patch || return 1
@@ -57,7 +59,6 @@ build() {
./configure --prefix=/usr \
--enable-shared=yes --without-x \
--disable-berkeley-db \
- --disable-netinfo \
--with-readline-lib=/usr/lib \
--with-readline-include=/usr/include/readline \
--with-openssl=/usr
@@ -159,5 +160,6 @@ md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz
45aeb207f360f9f4e9e0fabc8bfeecbc 005_all_heimdal-suid_fix.patch
1b8665b771c4eb6b56ea8582c96e56e3 013_all_heimdal-pthread-lib.patch
8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch
+e73205200f9641b5d969427ffb04282a 100-check-com_err-pthread.patch
7ebff9a320f18ed62f5fcb68c8fc18b8 heimdal-c++-safe-krb5_cccol_cursor.patch
248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 7ed0167e9..5666a5ed3 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -3,7 +3,7 @@
pkgname=imagemagick
pkgver=6.5.9.0
_pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
+pkgrel=1
pkgdesc="A collection of tools and libraries for many image formats"
url="http://www.imagemagick.org/"
license="GPL"
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 99e48f2e3..dd4aa7d47 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
license="BSD"
@@ -12,10 +12,14 @@ makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev
source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
bufferoverflow.patch"
-build ()
-{
- cd $srcdir/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
+}
+
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc/imlib2 \
--x-libraries=/usr/lib \
@@ -23,6 +27,10 @@ build ()
--disable-amd64 \
|| return 1
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make DESTDIR=$pkgdir install || return 1
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
diff --git a/main/lsof/APKBUILD b/main/lsof/APKBUILD
index f5285d487..b5f0018df 100644
--- a/main/lsof/APKBUILD
+++ b/main/lsof/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lsof
-pkgver=4.82
+pkgver=4.83
pkgrel=0
pkgdesc="LiSt Open Files"
url="http://people.freebsd.org/~abe/"
@@ -10,17 +10,28 @@ depends=
makedepends=""
source="ftp://sunsite.ualberta.ca/pub/Mirror/$pkgname/${pkgname}_$pkgver.tar.bz2"
-build ()
-{
- cd "$srcdir"/${pkgname}_$pkgver
+_builddir="$srcdir"/${pkgname}_${pkgver}/${pkgname}_${pkgver}_src
+
+prepare() {
+ # theres a tarball in teh tarball...
+ cd "$srcdir"/${pkgname}_${pkgver}
tar -xf ${pkgname}_${pkgver}_src.tar
- cd ${pkgname}_${pkgver}_src
+
+ cd "$_builddir"
sed -e "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-i dialects/linux/machine.h
+}
+
+build () {
+ cd "$_builddir"
./Configure -n linux
make || return 1
+}
+
+package() {
+ cd "$_builddir"
install -D -m0755 -o root -g root lsof "$pkgdir"/usr/sbin/lsof
install -D -m0644 -o root -g root lsof.8 \
"$pkgdir"/usr/share/man/man8/lsof.8
}
-md5sums="5518a0c16fc937523b3d1a946cf59e5b lsof_4.82.tar.bz2"
+md5sums="8f731a6251b8c0143d585df0d5ca779e lsof_4.83.tar.bz2"
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 3d5591383..0196168b5 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=nmap
pkgver=5.20
-pkgrel=0
+pkgrel=1
pkgdesc="A network exploration tool and security/port scanner"
url="http:/nmap.org"
license="custom:GPL"
@@ -10,6 +10,7 @@ depends=
makedepends="libpcap-dev openssl-dev lua-dev"
install=
subpackages="$pkgname-doc"
+replaces="nmap-nse"
source="http://nmap.org/dist/$pkgname-$pkgver.tgz"
_builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD
index 662d067be..ae8df6db5 100644
--- a/main/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@gmail.com>
# Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=pciutils
-pkgver=3.1.5
+pkgver=3.1.6
pkgrel=0
pkgdesc="PCI bus configuration space access library and tools"
url="http://mj.ucw.cz/pciutils.html"
@@ -37,4 +37,4 @@ package() {
}
-md5sums="6b25e3abce2efec188974fbc0ebaf575 pciutils-3.1.5.tar.gz"
+md5sums="96c46bad23fb05d96941f2d848613242 pciutils-3.1.6.tar.gz"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index f42cf5e17..6bb33d063 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=3.4.4
+pkgver=3.4.5
pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
@@ -108,7 +108,7 @@ tdb() {
usr/bin/tdb*
}
-md5sums="491a1bc9c94ad2f1e6d1c29da271b242 samba-3.4.4.tar.gz
+md5sums="8e8a484782f2b7716b6c6bd9a7d2bf71 samba-3.4.5.tar.gz
c8a7f6ac5df2f73dbf023e25ea39927b samba.initd
c150433426e18261e6e3eed3930e1a76 samba.confd
b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate"
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index c0e0a22f6..5cbce03a3 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=slim
pkgver=1.3.1
-pkgrel=3
+pkgrel=4
pkgdesc="Desktop-independent graphical login manager for X11"
url="http://slim.berlios.de/"
license="GPL-2"
@@ -21,6 +21,10 @@ prepare() {
for i in ../*.patch; do
patch -p1 -i $i || return 1
done
+
+ #libpng 1.4.0
+ sed -i -e 's/png12/png14/g' Makefile || return 1
+
sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|'\
-e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
-e 's|halt_cmd.*|halt_cmd /sbin/poweroff|'\
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index b9d1f799b..cf98592f5 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zlib
-pkgver=1.2.3.4
-pkgrel=1
+pkgver=1.2.3.7
+pkgrel=0
pkgdesc="A compression/decompression Library"
license=custom:zlib
url="http://www.gzip.org/zlib"
@@ -19,7 +19,6 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make install \
pkgconfigdir="/usr/lib/pkgconfig" \
- LIBS="libz.so.1.2.3.4 libz.a" \
DESTDIR="$pkgdir" || return 1
}
@@ -29,4 +28,4 @@ dev() {
mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
}
-md5sums="70cad33163abe3c234939a5c63bf95ea zlib-1.2.3.4.tar.gz"
+md5sums="323e45f54f321116a34950e8fbf5b6e7 zlib-1.2.3.7.tar.gz"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 22:57:48 +0000