diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/acf-alpine-baselayout/APKBUILD | 4 | ||||
-rw-r--r-- | main/acf-openssh/APKBUILD | 4 | ||||
-rw-r--r-- | main/busybox/APKBUILD | 7 | ||||
-rw-r--r-- | main/busybox/busybox-sed-3.patch | 120 | ||||
-rw-r--r-- | main/docbook-xml/APKBUILD | 257 | ||||
-rw-r--r-- | main/docbook-xml/docbook-xml.post-deinstall | 3 | ||||
-rw-r--r-- | main/docbook-xml/docbook-xml.post-install | 23 | ||||
-rw-r--r-- | main/docbook-xml/docbook-xml.post-upgrade | 21 | ||||
-rw-r--r-- | main/docbook-xsl/APKBUILD | 38 | ||||
-rw-r--r-- | main/docbook-xsl/docbook-xsl.install | 47 | ||||
-rw-r--r-- | main/docbook-xsl/docbook-xsl.post-deinstall | 7 | ||||
-rw-r--r-- | main/docbook-xsl/docbook-xsl.post-install | 29 | ||||
-rw-r--r-- | main/docbook-xsl/docbook-xsl.post-upgrade | 33 | ||||
-rw-r--r-- | main/e2fsprogs/APKBUILD | 22 | ||||
-rw-r--r-- | main/taglib/APKBUILD | 20 | ||||
-rw-r--r-- | main/util-linux-ng/APKBUILD | 65 |
16 files changed, 678 insertions, 22 deletions
diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index 2f4d9310..f912b0db 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-alpine-baselayout -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="08b5ef1254cd43655bd234c84adcb1ca acf-alpine-baselayout-0.5.2.tar.bz2" +md5sums="e2f476665cfeb73cd3dbbab859c36d6f acf-alpine-baselayout-0.5.3.tar.bz2" diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD index 9228bacd..684362d4 100644 --- a/main/acf-openssh/APKBUILD +++ b/main/acf-openssh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-openssh -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=0 pkgdesc="A web-based system administration interface for openssh" url="http://git.alpinelinux.org/cgit/acf-openssh" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="aa975654ce91969a978cc100dc046c63 acf-openssh-0.2.0.tar.bz2" +md5sums="10e355b5d64a3a50f947dce34df5ecf0 acf-openssh-0.2.1.tar.bz2" diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 3a5a6f87..7e428e21 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.14.3 -pkgrel=0 +pkgrel=3 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net license="GPL-2" @@ -11,7 +11,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 $pkgname-1.11.1-bb.patch 0001-install-compat-fix-for-mode-of-created-files.patch bb-tar-numeric-owner.patch - $install + busybox-sed-3.patch busyboxconfig" build() { @@ -48,6 +48,5 @@ md5sums="d170bf5f97a41aec3a505eab690d5699 busybox-1.14.3.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch 73d39c57483084298c7e46bdbbbea8d1 0001-install-compat-fix-for-mode-of-created-files.patch 0b5b2d7db201f90cd08f4a3164ee29a1 bb-tar-numeric-owner.patch -56b78c358797cd15fb64719a48939267 busybox.post-install -56b78c358797cd15fb64719a48939267 busybox.post-upgrade +b75c3f419f8392dfdadd92aa24fdba8c busybox-sed-3.patch 0be49dc673a849b5bf5e670db8c8c7b6 busyboxconfig" diff --git a/main/busybox/busybox-sed-3.patch b/main/busybox/busybox-sed-3.patch new file mode 100644 index 00000000..f916ce29 --- /dev/null +++ b/main/busybox/busybox-sed-3.patch @@ -0,0 +1,120 @@ +diff -d -urpN busybox.2/editors/sed.c busybox.3/editors/sed.c +--- busybox.2/editors/sed.c 2009-08-08 01:40:42.000000000 +0200 ++++ busybox.3/editors/sed.c 2009-08-17 01:32:00.000000000 +0200 +@@ -589,7 +589,7 @@ static void pipe_putc(char c) + + static void do_subst_w_backrefs(char *line, char *replace) + { +- int i,j; ++ int i, j; + + /* go through the replacement string */ + for (i = 0; replace[i]; i++) { +@@ -624,23 +624,24 @@ static void do_subst_w_backrefs(char *li + } + } + +-static int do_subst_command(sed_cmd_t *sed_cmd, char **line) ++static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p) + { +- char *oldline = *line; ++ char *line = *line_p; + int altered = 0; + unsigned match_count = 0; + regex_t *current_regex; + ++ current_regex = sed_cmd->sub_match; + /* Handle empty regex. */ +- if (sed_cmd->sub_match == NULL) { ++ if (!current_regex) { + current_regex = G.previous_regex_ptr; + if (!current_regex) + bb_error_msg_and_die("no previous regexp"); +- } else +- G.previous_regex_ptr = current_regex = sed_cmd->sub_match; ++ } ++ G.previous_regex_ptr = current_regex; + + /* Find the first match */ +- if (REG_NOMATCH == regexec(current_regex, oldline, 10, G.regmatch, 0)) ++ if (REG_NOMATCH == regexec(current_regex, line, 10, G.regmatch, 0)) + return 0; + + /* Initialize temporary output buffer. */ +@@ -657,7 +658,7 @@ static int do_subst_command(sed_cmd_t *s + The match_count check is so not to break + echo "hi" | busybox sed 's/^/!/g' */ + if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) { +- pipe_putc(*oldline++); ++ pipe_putc(*line++); + continue; + } + +@@ -669,35 +670,41 @@ static int do_subst_command(sed_cmd_t *s + && (sed_cmd->which_match != match_count) + ) { + for (i = 0; i < G.regmatch[0].rm_eo; i++) +- pipe_putc(*oldline++); ++ pipe_putc(*line++); + continue; + } + + /* print everything before the match */ + for (i = 0; i < G.regmatch[0].rm_so; i++) +- pipe_putc(oldline[i]); ++ pipe_putc(line[i]); + + /* then print the substitution string */ +- do_subst_w_backrefs(oldline, sed_cmd->string); ++ do_subst_w_backrefs(line, sed_cmd->string); + + /* advance past the match */ +- oldline += G.regmatch[0].rm_eo; ++ line += G.regmatch[0].rm_eo; + /* flag that something has changed */ + altered++; + + /* if we're not doing this globally, get out now */ + if (sed_cmd->which_match) + break; +- } while (*oldline && (regexec(current_regex, oldline, 10, G.regmatch, 0) != REG_NOMATCH)); + +- /* Copy rest of string into output pipeline */ ++ if (*line == '\0') ++ break; ++//maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL? ++ } while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH); + +- while (*oldline) +- pipe_putc(*oldline++); +- pipe_putc(0); ++ /* Copy rest of string into output pipeline */ ++ while (1) { ++ char c = *line++; ++ pipe_putc(c); ++ if (c == '\0') ++ break; ++ } + +- free(*line); +- *line = G.pipeline.buf; ++ free(*line_p); ++ *line_p = G.pipeline.buf; + return altered; + } + +diff -d -urpN busybox.2/testsuite/sed.tests busybox.3/testsuite/sed.tests +--- busybox.2/testsuite/sed.tests 2009-08-08 01:40:44.000000000 +0200 ++++ busybox.3/testsuite/sed.tests 2009-08-17 01:29:01.000000000 +0200 +@@ -241,4 +241,11 @@ testing "sed 2d;2,1p (gnu compat)" \ + "third\n" "" \ + "first\nsecond\nthird\nfourth\n" + ++# Regex means: "match / at BOL or nothing, then one or more not-slashes". ++# The bug was that second slash in /usr/lib was treated as "at BOL" too. ++testing "sed beginning (^) matches only once" \ ++ "sed 's,\(^/\|\)[^/][^/]*,>\0<,g'" \ ++ ">/usr</>lib<\n" "" \ ++ "/usr/lib\n" ++ + exit $FAILCOUNT diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD new file mode 100644 index 00000000..5b62dea3 --- /dev/null +++ b/main/docbook-xml/APKBUILD @@ -0,0 +1,257 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=docbook-xml +pkgver=4.5 +pkgrel=1 +pkgdesc="A widely used XML scheme for writing documentation and help" +url="http://scrollkeeper.sourceforge.net/docbook.shtml" +license="MIT" +depends="libxml2" +makedepends= +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +source="http://www.docbook.org/xml/$pkgver/$pkgname-$pkgver.zip + http://www.docbook.org/xml/4.4/$pkgname-4.4.zip + http://www.docbook.org/xml/4.3/$pkgname-4.3.zip + http://www.docbook.org/xml/4.2/$pkgname-4.2.zip + http://www.docbook.org/xml/4.1.2/docbkx412.zip + " + +unpack() { + # we unpack the zip's in subdirs in build() + : +} + +build () +{ + for ver in 4.1.2 4.2 4.3 4.4 4.5; do + case $ver in + 4.1.2) _pv=412;; + *) _pv=$ver;; + esac + mkdir -p "$srcdir"/docbook-xml-${ver} + cd "$srcdir"/docbook-xml-${ver} + unzip "$srcdir"/docbook-xml-${_pv}.zip + mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver} + cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}/ + done + mkdir -p "$pkgdir"/etc/xml + xmlcatalog --noout --create "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add \ + "public" \ + "-//OASIS//DTD DocBook XML V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.2" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.2" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + "$pkgdir"/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + "$pkgdir"/etc/xml/docbook-xml +} +md5sums="03083e288e87a7e829e437358da7ef9e docbook-xml-4.5.zip +cbb04e9a700955d88c50962ef22c1634 docbook-xml-4.4.zip +ab200202b9e136a144db1e0864c45074 docbook-xml-4.3.zip +73fe50dfe74ca631c1602f558ed8961f docbook-xml-4.2.zip +900d7609fb7e6d78901b357e4acfbc17 docbkx412.zip" diff --git a/main/docbook-xml/docbook-xml.post-deinstall b/main/docbook-xml/docbook-xml.post-deinstall new file mode 100644 index 00000000..92537861 --- /dev/null +++ b/main/docbook-xml/docbook-xml.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog diff --git a/main/docbook-xml/docbook-xml.post-install b/main/docbook-xml/docbook-xml.post-install new file mode 100644 index 00000000..fa5f2a99 --- /dev/null +++ b/main/docbook-xml/docbook-xml.post-install @@ -0,0 +1,23 @@ +#!/bin/sh + +if [ ! -e etc/xml/catalog ]; then + xmlcatalog --noout --create etc/xml/catalog +fi + +xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog + diff --git a/main/docbook-xml/docbook-xml.post-upgrade b/main/docbook-xml/docbook-xml.post-upgrade new file mode 100644 index 00000000..79bb90e7 --- /dev/null +++ b/main/docbook-xml/docbook-xml.post-upgrade @@ -0,0 +1,21 @@ +#!/bin/sh + +xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog + +xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog + diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD new file mode 100644 index 00000000..0c9eb9b9 --- /dev/null +++ b/main/docbook-xsl/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=docbook-xsl +pkgver=1.74.0 +pkgrel=0 +pkgdesc="XML stylesheets for Docbook-xml transformations." +url="http://scrollkeeper.sourceforge.net/docbook.shtml" +license="custom" +depends="libxml2 libxslt docbook-xml" +makedepends="" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + _dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver + mkdir -p "$_dest"/common + for i in xml xsl dtd ent; do + install -m644 common/*.$i "$_dest"/common/ + done + mkdir -p "$_dest"/params + install -m644 params/*.xml "$_dest"/params/ + for fn in fo highlighting html roundtrip; do + mkdir -p "$_dest"/$fn + install -m644 ${fn}/*.xml "$_dest"/$fn/ + install -m644 ${fn}/*.xsl "$_dest"/$fn/ + done + for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml; do + mkdir -p "$_dest"/$fn + install -m644 ${fn}/*.xsl "$_dest"/$fn/ + done + mkdir -p "$pkgdir"/etc/xml + install -m644 VERSION "$_dest"/ + install -m644 -D COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +md5sums="a56b598decd006d5d39e4544c0bfbc6a docbook-xsl-1.74.0.tar.bz2" diff --git a/main/docbook-xsl/docbook-xsl.install b/main/docbook-xsl/docbook-xsl.install new file mode 100644 index 00000000..a8ea3e72 --- /dev/null +++ b/main/docbook-xsl/docbook-xsl.install @@ -0,0 +1,47 @@ +post_install() { + if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog + fi + _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog +} + +post_upgrade() { + post_remove $2 + post_install $1 +} + +post_remove() { + _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog + + if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then + xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog + xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog + fi +} + +op=$1 +shift + +$op $* + diff --git a/main/docbook-xsl/docbook-xsl.post-deinstall b/main/docbook-xsl/docbook-xsl.post-deinstall new file mode 100644 index 00000000..1d042b04 --- /dev/null +++ b/main/docbook-xsl/docbook-xsl.post-deinstall @@ -0,0 +1,7 @@ +#!/bin/sh + +_OLD=${1%-r[0-9]*} + +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ + etc/xml/catalog diff --git a/main/docbook-xsl/docbook-xsl.post-install b/main/docbook-xsl/docbook-xsl.post-install new file mode 100644 index 00000000..6afae6ab --- /dev/null +++ b/main/docbook-xsl/docbook-xsl.post-install @@ -0,0 +1,29 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + + +_NEW=${1%-r[0-9]*} + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + diff --git a/main/docbook-xsl/docbook-xsl.post-upgrade b/main/docbook-xsl/docbook-xsl.post-upgrade new file mode 100644 index 00000000..d481480f --- /dev/null +++ b/main/docbook-xsl/docbook-xsl.post-upgrade @@ -0,0 +1,33 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + +_NEW=${1%-r[0-9]*} +_OLD=${2%-r[0-9]*} + +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD index eedabbff..41ad9a0b 100644 --- a/main/e2fsprogs/APKBUILD +++ b/main/e2fsprogs/APKBUILD @@ -1,20 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs pkgver=1.41.8 -pkgrel=0 +pkgrel=1 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" license="GPL LGPL MIT" depends= -subpackages="$pkgname-dev $pkgname-doc libuuid libcom_err libblkid" +makedepends="util-linux-ng-dev pkgconfig" +subpackages="$pkgname-dev $pkgname-doc libcom_err" source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz" +depends_dev="util-linux-ng-dev" + build () { cd ${srcdir}/${pkgname}-${pkgver} ./configure \ --mandir=/usr/share/man \ --enable-elf-shlibs \ + --disable-fsck \ --disable-uuidd \ + --disable-libuuid \ + --disable-libblkid \ --disable-tls \ --disable-nls @@ -22,22 +28,10 @@ build () { make LDCONFIG=: DESTDIR=${pkgdir} install install-libs || return 1 } -libuuid() { - depends= - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/ -} - libcom_err() { depends= mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -libblkid() { - depends= - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ -} - md5sums="6708cc8e484809fc5cfb232882e48489 e2fsprogs-1.41.8.tar.gz" diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD new file mode 100644 index 00000000..ff03066e --- /dev/null +++ b/main/taglib/APKBUILD @@ -0,0 +1,20 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=taglib +pkgver=1.5 +pkgrel=0 +pkgdesc="library for reading and editing the meta-data of several popular audio formats." +url="http://ktown.kde.org/~wheeler/taglib.html" +license="GPL2" +makedepends="zlib-dev cmake" +depends= +source="http://ktown.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make VERBOSE=1 || return 1 + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="7b557dde7425c6deb7bbedd65b4f2717 taglib-1.5.tar.gz" diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD new file mode 100644 index 00000000..68641051 --- /dev/null +++ b/main/util-linux-ng/APKBUILD @@ -0,0 +1,65 @@ +# Contributor: Leonardo Arena <rnalrd@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=util-linux-ng +pkgver=2.16 +pkgrel=1 +pkgdesc="Random collection of Linux utilities" +arch="" +url="http://kernel.org/~kzak/util-linux-ng/" +license="GPL-2 GPL Public Domain" +depends= +# use GNU sed til bb sed is fixed +makedepends="zlib-dev sed" +install= +source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk" +replaces="e2fsprogs" + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -e 's/versionsort/alphasort/g'\ + -e 's/strverscmp.h/dirent.h/g' \ + -i mount/lomount.c + + ./configure --prefix=/usr \ + --disable-uuidd \ + --disable-nls \ + --disable-tls \ + --disable-kill \ + --disable-init \ + --without-ncurses \ + --without-pam + + make || return 1 + make -j1 install DESTDIR="$pkgdir" + # use pkg-config + rm -f "$pkgdir"/usr/lib/*.la +} + +dev() { + default_dev + replaces="e2fsprogs-dev" +} + +libuuid() { + pkgdesc="DCE compatible Universally Unique Identifier library" + depends= + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/ +} + +libblkid() { + pkgdesc="Block device identification library from util-linux-ng" + depends= + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ +} + +sfdisk() { + pkgdesk="Partition table manipulator from util-linux-ng" + depends= + mkdir -p "$subpkgdir"/sbin + mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/ +} + +md5sums="f6aba93a43b7736782d7aaa3718c45e3 util-linux-ng-2.16.tar.gz" |