...
 
Commits (721)
From 563409ed82164663e08835ed07584337ce601773 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 8 Jun 2015 07:27:23 +0000
Subject: [PATCH] abuild: clear inherit provides and install_if for subpackages
Unexpected result will happen if subpackages inherits the provides or
install_if from main package. So we clear them.
---
abuild.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/abuild.in b/abuild.in
index 9e6f43a..cb069f2 100644
--- a/abuild.in
+++ b/abuild.in
@@ -947,6 +947,11 @@ archcheck() {
prepare_package() {
msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..."
+ if [ -n "$subpkgname" ]; then
+ # the subpackages should not inherit those
+ provides=""
+ install_if=""
+ fi
stripbin
prepare_metafiles \
&& prepare_trace_rpaths \
--
2.4.2
From 0e58eeff8089c8c148c20a5e239d618095ec434f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 11 Jun 2015 11:56:04 +0000
Subject: [PATCH] abuild: fix provides and install_if in subpackages
we need to clear provides set in global scope before splitting the
subpackages so the subpackage does not inherit main packages' provides.
But at the same time, we must not clear the provides/install_if set in
the splitfunction itself.
---
abuild.in | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/abuild.in b/abuild.in
index cb069f2..dc72d79 100644
--- a/abuild.in
+++ b/abuild.in
@@ -683,6 +683,15 @@ postcheck() {
return 0
}
+pre_split() {
+ if [ -z "$subpkgname" ]; then
+ return 0
+ fi
+ # the subpackages should not inherit those form main package
+ provides=""
+ install_if=""
+}
+
prepare_subpackages() {
local i
cd "$startdir"
@@ -692,7 +701,7 @@ prepare_subpackages() {
msg "Running split function $func..."
local dir="$pkgbasedir/${i%:*}" name="${i%:*}"
( subpkgdir="$dir" subpkgname="$name" \
- $0 $func prepare_package \
+ $0 pre_split $func prepare_package \
&& postcheck "$dir" "$name" ) || return 1
done
postcheck "$pkgdir" "$pkgname" || return 1
@@ -947,11 +956,6 @@ archcheck() {
prepare_package() {
msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..."
- if [ -n "$subpkgname" ]; then
- # the subpackages should not inherit those
- provides=""
- install_if=""
- fi
stripbin
prepare_metafiles \
&& prepare_trace_rpaths \
--
2.4.2
......@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.22.0
_ver=${pkgver%_git*}
pkgrel=0
pkgrel=3
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
......@@ -20,6 +20,9 @@ subpackages="apkbuild-cpan:cpan"
options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
0001-abuild-fix-provides-and-install_if-in-subpackages.patch
fix-fetch-to-nfs.patch
"
_builddir="$srcdir/$pkgname-$_ver"
......@@ -58,6 +61,15 @@ cpan() {
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
md5sums="46184ce2dc86294f3f8de9fe80200a7e abuild-2.22.0.tar.xz"
sha256sums="0d24dca8fa8acc6a033e73d6cfbc6062e91c14e7b73456bd9a273f570cd91e47 abuild-2.22.0.tar.xz"
sha512sums="c95b8ecba39ba9a76f2de6fc33aae70e040d6d6041b2365066ce2a8cb92a8ae115697f93add1c8e0ae71b1cac1ed43437416dd323fed8959a0610cc204b4a0f1 abuild-2.22.0.tar.xz"
md5sums="46184ce2dc86294f3f8de9fe80200a7e abuild-2.22.0.tar.xz
00bdd3304f7d89decc5d4b84e30a10b5 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
60460524b974ad082e722b8a5d65460a 0001-abuild-fix-provides-and-install_if-in-subpackages.patch
054fed59c1e765c8f36db32fc1cdd89e fix-fetch-to-nfs.patch"
sha256sums="0d24dca8fa8acc6a033e73d6cfbc6062e91c14e7b73456bd9a273f570cd91e47 abuild-2.22.0.tar.xz
d8744ecb58d86ecb40ee22edbdbcdba1e93cc8e331a9d98641446c08b307873a 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
c305ef06ba09e40a886674bc4e36c253e91910ed7818ea6544f82ccf345f580e 0001-abuild-fix-provides-and-install_if-in-subpackages.patch
d39d196894eb168db365e60647ed6575f3a54723194ac90617d63cf407bf4e28 fix-fetch-to-nfs.patch"
sha512sums="c95b8ecba39ba9a76f2de6fc33aae70e040d6d6041b2365066ce2a8cb92a8ae115697f93add1c8e0ae71b1cac1ed43437416dd323fed8959a0610cc204b4a0f1 abuild-2.22.0.tar.xz
bb55aad137f2cf02f36ce57581a1dc00f6f70f5d4df1c3fcf509772757668abfb3e5e862e40f2b62fad707ec44278f33242f8d37a64473bc72423263df939fea 0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
7269481a60a87bf2196c1a10ccfc6226d20c99e45a20e45f10aff2f174aaa2e5f92a88e374c15fbc76f3ffada49841bac3ad2208b78587a185048060aa3e5eb3 0001-abuild-fix-provides-and-install_if-in-subpackages.patch
29cde6a7ec1960f7c6fb899d5f95dde9155b114f943ebc396d895777e30bdfb456f22549e5a7a34c8a10245d47d90e3ca64efa94d985953a130aa155d2dc02e5 fix-fetch-to-nfs.patch"
From 92186b70ca9c520fc726e0885aac633aadace655 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 26 Aug 2015 08:14:36 +0200
Subject: abuild: fix fetch lock file on nfs
flock(2) on an NFS mount will on the server side convert the lock to a
POSIX lock (fcntl(F_SETLK)). This means that abuild running on NFS
server and client will create different locks and they will both try
download same file at same time.
We fix this by creating a small abuild-fetch application that will
create a POSIX lock which works with NFS.
---
Makefile | 6 +-
abuild-fetch.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
abuild.in | 69 +-------------------
3 files changed, 200 insertions(+), 69 deletions(-)
create mode 100644 abuild-fetch.c
diff --git a/Makefile b/Makefile
index 81c2851..b7332b2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ abuildrepo ?= ~/.cache/abuild
SCRIPTS := abuild abuild-keygen abuild-sign newapkbuild \
abump apkgrel buildlab apkbuild-cpan checkapk \
apkbuild-gem-resolver
-USR_BIN_FILES := $(SCRIPTS) abuild-tar abuild-sudo
+USR_BIN_FILES := $(SCRIPTS) abuild-tar abuild-sudo abuild-fetch
SAMPLES := sample.APKBUILD sample.initd sample.confd \
sample.pre-install sample.post-install
AUTOTOOLS_TOOLCHAIN_FILES := config.sub
@@ -47,6 +47,7 @@ LIBS-abuild-tar = $(SSL_LIBS)
CFLAGS-abuild-tar = $(SSL_CFLAGS)
OBJS-abuild-sudo = abuild-sudo.o
+OBJS-abuild-fetch = abuild-fetch.o
.SUFFIXES: .sh.in .in
%.sh: %.sh.in
@@ -73,6 +74,9 @@ abuild-sudo: abuild-sudo.o
abuild-tar: abuild-tar.o
$(LINK)
+abuild-fetch: abuild-fetch.o
+ $(LINK)
+
abuild-tar.static: abuild-tar.o
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS-$@) -o $@ -static $(LIBS-$@) $^
diff --git a/abuild-fetch.c b/abuild-fetch.c
new file mode 100644
index 0000000..51b41eb
--- /dev/null
+++ b/abuild-fetch.c
@@ -0,0 +1,194 @@
+/* MIT license
+
+Copyright (C) 2015 Natanael Copa <ncopa@alpinelinux.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+
+#include <sys/wait.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static char *program;
+static char lockfile[PATH_MAX] = "";
+
+struct cmdarray {
+ size_t argc;
+ char *argv[32];
+};
+
+void add_opt(struct cmdarray *cmd, char *opt)
+{
+ cmd->argv[cmd->argc++] = opt;
+ cmd->argv[cmd->argc] = NULL;
+}
+
+int usage(int eval)
+{
+ printf("usage: %s [-d DESTDIR] URL\n", program);
+ return eval;
+}
+
+/* create or wait for an NFS-safe lockfile and fetch url with curl or wget */
+int fetch(char *url, const char *destdir)
+{
+ int lockfd, status=0;
+ pid_t childpid;
+ char outfile[PATH_MAX], partfile[PATH_MAX];
+ char *name, *p;
+ struct flock fl = {
+ .l_type = F_WRLCK,
+ .l_whence = SEEK_SET,
+ .l_start = 1,
+ .l_len = 0,
+ };
+ struct cmdarray curlcmd = {
+ .argc = 6,
+ .argv = { "curl", "-k", "-L", "-f", "-o", partfile, NULL }
+ };
+ struct cmdarray wgetcmd = {
+ .argc = 3,
+ .argv = { "wget", "-O", partfile, NULL }
+ };
+
+ name = strrchr(url, '/');
+ if (name == NULL)
+ errx(1, "%s: no '/' in url");
+ p = strstr(url, "::");
+ if (p != NULL) {
+ name = url;
+ *p = '\0';
+ url = p + 2;
+ } else if (strstr(url, "saveas-") == url) {
+ *name++ = '\0';
+ url += 7; /* strlen("saveas-") */
+ } else {
+ name++;
+ }
+
+ snprintf(outfile, sizeof(outfile), "%s/%s", destdir, name);
+ snprintf(lockfile, sizeof(lockfile), "%s.lock", outfile);
+ snprintf(partfile, sizeof(partfile), "%s.part", outfile);
+
+ lockfd = open(lockfile, O_WRONLY|O_CREAT, 0660);
+ if (lockfd < 0)
+ err(1, lockfile);
+
+ if (fcntl(lockfd, F_SETLK, &fl) < 0) {
+ printf("Waiting for %s ...\n", lockfile);
+ if (fcntl(lockfd, F_SETLKW, &fl) < 0)
+ err(1, "fcntl(F_SETLKW)");
+ }
+
+ if (access(outfile, F_OK) == 0)
+ goto fetch_done;
+
+ if (access(partfile, F_OK) == 0) {
+ printf("Partial download found. Trying to resume.\n");
+ add_opt(&curlcmd, "-C");
+ add_opt(&curlcmd, "-");
+ add_opt(&wgetcmd, "-c");
+ }
+
+ add_opt(&curlcmd, url);
+ add_opt(&wgetcmd, url);
+
+ childpid = fork();
+ if (childpid < 0 )
+ err(1, "fork");
+
+ if (childpid == 0) {
+ execvp(curlcmd.argv[0], curlcmd.argv);
+ printf("Using wget\n");
+ execvp(wgetcmd.argv[0], wgetcmd.argv);
+ warn(wgetcmd.argv[0]);
+ unlink(lockfile);
+ exit(1);
+ }
+ wait(&status);
+ rename(partfile, outfile);
+
+fetch_done:
+ unlink(lockfile);
+ close(lockfd);
+ lockfile[0] = '\0';
+ return status;
+
+}
+
+void sighandler(int sig)
+{
+ switch(sig) {
+ case SIGABRT:
+ case SIGINT:
+ case SIGQUIT:
+ case SIGTERM:
+ unlink(lockfile);
+ exit(0);
+ break;
+ default:
+ break;
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ int opt, r=0, i;
+ char *destdir = "/var/cache/distfiles";
+
+ program = argv[0];
+ while ((opt = getopt(argc, argv, "hd:")) != -1) {
+ switch (opt) {
+ case 'h':
+ return usage(0);
+ break;
+ case 'd':
+ destdir = optarg;
+ break;
+ default:
+ printf("Unkonwn option '%c'\n", opt);
+ return usage(1);
+ break;
+ }
+ }
+
+ argv += optind;
+ argc -= optind;
+
+ if (argc < 1)
+ return usage(1);
+
+ signal(SIGABRT, sighandler);
+ signal(SIGINT, sighandler);
+ signal(SIGQUIT, sighandler);
+ signal(SIGTERM, sighandler);
+
+ for (i = 0; i < argc; i++) {
+ if (fetch(argv[i], destdir))
+ r++;
+ }
+ return r;
+}
diff --git a/abuild.in b/abuild.in
index b8d8851..952048b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -298,79 +298,12 @@ sourcecheck() {
return 0
}
-# convert curl options to wget options and call wget instead of curl
-wget_fallback() {
- local wget_opts= outfile= opt=
- while getopts "C:Lko:s" opt; do
- case $opt in
- 'L') ;; # --location. wget does this by default
- 'f') ;; # --fail. wget does this by default
- 'C') wget_opts="$wget_opts -c";; # --continue-at
- 's') wget_opts="$wget_opts -q";; # --silent
- 'o') wget_opts="$wget_opts -O $OPTARG";; # --output
- 'k') wget_opts="$wget_opts --no-check-certificate";; #gnu wget
- esac
- done
- shift $(( $OPTIND - 1 ))
- wget $wget_opts "$1"
-}
-
uri_fetch() {
local uri="$1"
- local d="${uri##*/}" # $(basename $uri)
- local opts
[ -n "$quiet" ] && opts="-s"
- local lockfile="$SRCDEST/$d".lock
-
- # fix saveas-*://* URIs
- case "$uri" in
- # remove 'saveas-' from beginning and
- # '/filename' from end of URI
- saveas-*://*) uri="${uri:7:$(expr ${#uri} - 7 - ${#d} - 1)}";;
-
- *::*)
- d=${uri%%::*}
- uri=${uri#$d::}
- ;;
- esac
-
- case "$uri" in
- https://*) opts="-k";;
- esac
-
mkdir -p "$SRCDEST"
-
- CLEANUP_FILES="$CLEANUP_FILES $lockfile"
- (
- flock -n -x 9 || msg "Waiting for ${lockfile##*/}..."
- flock -x 9
-
- [ -f "$SRCDEST/$d" ] && exit 0 # use exit since its a subshell
-
- if [ -f "$SRCDEST/$d.part" ]; then
- msg "Partial download found. Trying to resume"
- opts="$opts -C -"
- fi
- msg "Fetching $uri"
-
- # fallback to wget if curl is missing. useful for bootstrapping
- local fetcher=
- if ! [ -x "$(which curl)" ]; then
- fetcher=wget_fallback
- else
- fetcher=curl
- opts="$opts -L -f -k"
- fi
-
- $fetcher $opts -o "$SRCDEST/$d.part" "$uri" \
- && mv "$SRCDEST/$d.part" "$SRCDEST/$d"
-
- ) 9>$lockfile
-
- local rc=$?
- rm -f "$lockfile"
- return $rc
+ abuild-fetch -d "$SRCDEST" "$uri"
}
is_remote() {
--
cgit v0.11.2
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-alpine-baselayout
pkgver=0.12.1
pkgver=0.12.2
pkgrel=0
pkgdesc="A web-based system administration interface for alpine-baselayout"
url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
......@@ -15,6 +15,6 @@ package() {
make DESTDIR="$pkgdir" install
}
md5sums="933f0497dafeeef9c0ad7ec4654b8495 acf-alpine-baselayout-0.12.1.tar.xz"
sha256sums="7d79c356a61967836907e11bce3abfd79661a0b16f63bbf9e56a80ba10d759e5 acf-alpine-baselayout-0.12.1.tar.xz"
sha512sums="ddb1c8fe73871a43c13db60a4f200ac5cd671cfe0108e8d75e150e394507dc6fd85f9f8ac74984a709b6460a18adc9b50fdf3e83681c7ddd7ffe2f75f475d206 acf-alpine-baselayout-0.12.1.tar.xz"
md5sums="7719a46325568d65984e031ca8af89c4 acf-alpine-baselayout-0.12.2.tar.xz"
sha256sums="84a64591e164b46d0a0ffcdee8b9bde496db67ed88b45b2122d132034f1e4825 acf-alpine-baselayout-0.12.2.tar.xz"
sha512sums="e324998389e2976ef1bd1052a90e90e8414c6f8592de1d5866237f83a8d80ba9e0ec38fba2c77a5b604260bc401dea6804176c3d4bd5eb6fcd130839bcec32bb acf-alpine-baselayout-0.12.2.tar.xz"
......@@ -2,7 +2,7 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
_luaversion="5.2"
pkgname=acf-core
pkgver=0.18.8
pkgver=0.18.12
pkgrel=0
pkgdesc="A web-based system administration interface framework"
url="http://git.alpinelinux.org/cgit/acf-core"
......@@ -29,6 +29,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
mkdir -p "$pkgdir"/etc/acf/skins
}
md5sums="1e9c0579eafb9c28fc7e873df1c47073 acf-core-0.18.8.tar.xz"
sha256sums="fdd19d211f35728b17807d39af699b2729aab0aa7923d9359cd861d650cedba5 acf-core-0.18.8.tar.xz"
sha512sums="77d813f0a51c3e50100955b9786f30590397f0391312ccfca726b3ae26685bad536cf4a2c77bf30811376b9f088ea38db2875c720b6625a63c011182e74b132a acf-core-0.18.8.tar.xz"
sha512sums="37437f3c003e145be5d7e9c15e2425ef95b521793dabe53f97545dd9e8ff2d7115cffda351f222b7f0538495b54d7546d1ba7d0bf8046f4b84464c2648f5aea0 acf-core-0.18.12.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-db
pkgver=0.1.3
pkgver=0.2.1
pkgrel=0
pkgdesc="A web-based system administration interface for databases"
url="http://git.alpinelinux.org/cgit/acf-db"
......@@ -29,6 +29,6 @@ lib() {
"$subpkgdir"/usr/share/acf/lib/ || return 1
}
md5sums="2f322857b0fb0c658e5ac4f7a6847463 acf-db-0.1.3.tar.xz"
sha256sums="7c917cbadcfcdeab200b9f5510cf33d5263ea98a29d67b7c130047ada6878fd8 acf-db-0.1.3.tar.xz"
sha512sums="eabb3b79ade2cbc5b033478234083989c162be075762efae629c1500084f5420052300893c2e96cd0b9cc6f7dd6a1dc47d5381d8026bb694e44e17db68185b82 acf-db-0.1.3.tar.xz"
md5sums="e1ccfaf550cde509eea166a445c8e0ca acf-db-0.2.1.tar.xz"
sha256sums="f010ff6c77536324bc3abaed833900aebb83e7c9754a3b0722e852223beb06d7 acf-db-0.2.1.tar.xz"
sha512sums="850a3c5a2b294bd6e0b718357f93a3aaa7668a852b4854f636541c3e40cddce3dc1805a291c5900808cd95fa7ccd718db481431069a98df2a775d0fab1b6f3c4 acf-db-0.2.1.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-dhcp
pkgver=0.8.0
pkgver=0.8.1
pkgrel=0
pkgdesc="A web-based system administration interface for dhcp"
url="http://git.alpinelinux.org/cgit/acf-dhcp"
......@@ -20,6 +20,6 @@ package() {
}
md5sums="b64897d17a07554bbff47ad0ced63d3d acf-dhcp-0.8.0.tar.xz"
sha256sums="08995e8f68bccb2bd8112bba859d3fabbe7564cbb6a2b83eecd91b43f6932624 acf-dhcp-0.8.0.tar.xz"
sha512sums="5d1399c1c368866cd8a8b51db79a4cd4a243720384d3a298f7c0f4fc2a86a43093147e30efb381c0eba9e1d7026e30ba097a45f784dc6a12a891b2645055b34b acf-dhcp-0.8.0.tar.xz"
md5sums="90e6c48685830b7fa2036dad4c437b0c acf-dhcp-0.8.1.tar.xz"
sha256sums="4e108b79e3d6bc83221ae0c22a15a576b87762167ace25ab2b6d684dee6f0d4c acf-dhcp-0.8.1.tar.xz"
sha512sums="3992a41f5b547213c20567364db80ff9fc6ea4182ab7bbd14227857d9f73bccbad2dc62d79acda60323d616a890ff3cfd23d8272c445374a1a8e994e35ee80c2 acf-dhcp-0.8.1.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeradius3
pkgver=0.1.1
pkgver=0.1.3
pkgrel=0
pkgdesc="ACF for freeradius 3"
url="http://git.alpinelinux.org/cgit/acf-freeradius3"
......@@ -18,6 +18,4 @@ package() {
make DESTDIR="$pkgdir" install
}
md5sums="3336505c3b57e72c5fb09519918a9554 acf-freeradius3-0.1.1.tar.xz"
sha256sums="71cd52185cd1976ee8bdcd211dd3f1b51164eeb255e658ea2367f5603779fc72 acf-freeradius3-0.1.1.tar.xz"
sha512sums="1f49e6fad411ae85e378bd14cc66ed215c06c66c7cb862860189fd8081361aa8d1bf40eb70e779d622294789df3b54f842bd04fe611bb55dba80038c8b1a493f acf-freeradius3-0.1.1.tar.xz"
sha512sums="b507b122348883ecad2b84352b63fa4d0bd7f8202aaf499d5858c98850e49bff29d337cf8df113314b9aa61144165761e97d4beb9c3347112c72167270a6a528 acf-freeradius3-0.1.3.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeswitch-vmail
pkgver=0.5.0
pkgver=0.6.2
pkgrel=0
pkgdesc="ACF for a web interface for freeswitch voicemail"
url="http://git.alpinelinux.org/cgit/$pkgname"
......@@ -18,6 +18,6 @@ package() {
make DESTDIR="$pkgdir" install
}
md5sums="ac1654d86f98e00f194acf7b48a89d18 acf-freeswitch-vmail-0.5.0.tar.xz"
sha256sums="c0582ba93d4ca3632d4b147716b50df0f339a244ba909938d6f1cd589f0e2bce acf-freeswitch-vmail-0.5.0.tar.xz"
sha512sums="54107559090a2ecab41cdf28c71fac35054821c076906b9df241ea27942a6762b1201d57625b695077026497e843ba187228a18b059eb33148138b87b5f95f37 acf-freeswitch-vmail-0.5.0.tar.xz"
md5sums="c04ff9cbcb37453426c015d3cef87543 acf-freeswitch-vmail-0.6.2.tar.xz"
sha256sums="a98e784b267979dab71bce40d37c0ebb3161b128031fd056cabfff225073058f acf-freeswitch-vmail-0.6.2.tar.xz"
sha512sums="9f5984dc8339162274d3b3efb4946e88bee715674b315ed4026de7e4bb0fc334641de09aad5244dc093fc2c2225a62bd424f09a78f0ae5994c80ca5ce3c3b79a acf-freeswitch-vmail-0.6.2.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-iptables
pkgver=0.7.0
pkgver=0.7.1
pkgrel=0
pkgdesc="A web-based system administration interface for iptables"
url="http://git.alpinelinux.org/cgit/acf-iptables"
......@@ -20,6 +20,6 @@ package() {
}
md5sums="42f437053b8c7a9c096a073ad44e3731 acf-iptables-0.7.0.tar.xz"
sha256sums="5b7b64b5a13c0ba92841499d6dc39fcfb68979368a6523442311b95d81270dc5 acf-iptables-0.7.0.tar.xz"
sha512sums="f9086253a2713ebf7f9bba50f9d82c22ef255c07ca9802071448173ad93ce1ddc0493ec11b7281936eee97d3c7436fcde3d2fc1e00732575ea541bf6a48da3b4 acf-iptables-0.7.0.tar.xz"
md5sums="8ebac62f78bd8482149c8e94367a1b5f acf-iptables-0.7.1.tar.xz"
sha256sums="9b84ed1c680f4be79f3df7e342466336d98959ee493a23b12c89ce998d9fe78e acf-iptables-0.7.1.tar.xz"
sha512sums="1def7240cbbceb06e810ac00463b8b7693e6fe7c7f70be91c0ee8b4fe3a25869bf583425f6b9f16057d41909f819b1875ed48cc9f3837a265e42986eb303f303 acf-iptables-0.7.1.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-jquery
pkgver=0.3.1
pkgver=0.4.2
pkgrel=0
pkgdesc="jquery libraries for ACF"
url="http://git.alpinelinux.org/cgit/acf-jquery"
......@@ -15,6 +15,6 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
md5sums="07624369018a713f953637b8914c2d6f acf-jquery-0.3.1.tar.xz"
sha256sums="2f54dccdd483c8fa509bf1a27b3e9c4cd7abad1e64e3558b15666b653d5af2b2 acf-jquery-0.3.1.tar.xz"
sha512sums="f26ed2cd4bb2c0e50351d02293713a82a7ce50bf7324e1fa9bee92ba3e27d990cc20ebb606d657ea8f8143bb0b83824107ec751220895d24988bbecdc1790a44 acf-jquery-0.3.1.tar.xz"
md5sums="b2162d8c4df46aa6a8c286eb994853fd acf-jquery-0.4.2.tar.xz"
sha256sums="d7890f40c001cc0a0f2758a1ef157d3b74f6321f26c644f37216cd9eefc57ff7 acf-jquery-0.4.2.tar.xz"
sha512sums="255e4351d26eba731d5a8428adfb297387d64b387f66cb0925fb881a868117b73f9486a0f88ba3dc5ac359aa53782b8added9b0455e746c210261f7d939dd263 acf-jquery-0.4.2.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-kamailio
pkgver=0.9.2
pkgver=0.9.3
pkgrel=0
pkgdesc="A web-based system administration interface for kamailio"
url="http://git.alpinelinux.org/cgit/acf-kamailio"
......@@ -20,6 +20,6 @@ package() {
}
md5sums="c4cbbbc6f0a974c1e7630f318eee5d59 acf-kamailio-0.9.2.tar.xz"
sha256sums="2304b04270d1bda5902bbd27e028248c1a4a89b6b0f6b9c3f6e98357862763db acf-kamailio-0.9.2.tar.xz"
sha512sums="da0bd4d981ed3e12308611852561401f3de2ba74f4a0996f80eb8b71a715b2ed98f1ce117cc090eba75396d346a4870bcd107f2b1999d8dba2c0f8564ba8f8ab acf-kamailio-0.9.2.tar.xz"
md5sums="995717dae3817712325041d10cb88fe1 acf-kamailio-0.9.3.tar.xz"
sha256sums="b0fa782265926f1a9ba1dfdf3c951bfdefc9d02e730b6f5cc3d3132a87fc4641 acf-kamailio-0.9.3.tar.xz"
sha512sums="c924c9f5330b2ee0eb1720943210e8e5f4246dfee9ad816f6cd6a608b2b8d8c48df93060295e9d31f4112971efdc60c3641d7a91601674b43f4851bb560218e7 acf-kamailio-0.9.3.tar.xz"
......@@ -2,7 +2,7 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
_luaversions="5.1 5.2"
pkgname=acf-lib
pkgver=0.7.3
pkgver=0.8.1
pkgrel=0
pkgdesc="Lua libraries for ACF"
url="http://git.alpinelinux.org/cgit/acf-lib"
......@@ -18,6 +18,6 @@ package() {
make DESTDIR="$pkgdir" install
done
}
md5sums="0e2173648f983f24e6bc88fb7289f6bb acf-lib-0.7.3.tar.xz"
sha256sums="ae16a0c54832a77448315dcf1708d21e374046de3d219b96376eb2a7cce3c1f1 acf-lib-0.7.3.tar.xz"
sha512sums="95f1c70a2b4dfa22a3d044b9511a20b04e21e45ca206cfd5a4929f92280af3fff30a36807124c166c1700a07f2bec5b6112e62757619313ab1e88cdb3973e5d5 acf-lib-0.7.3.tar.xz"
md5sums="fe51c8849e501908b3768228d59f8828 acf-lib-0.8.1.tar.xz"
sha256sums="123f7bdb386c6dd0428b347c34132f63ea62e753e093a6187294b71cdbfd169f acf-lib-0.8.1.tar.xz"
sha512sums="059c802c3fc2a0ab0f50e443b5c326cb5735f08b260c87e7ec7d047b027424bca5983781392a8f50c2c27df89e9ef56d3d30c2edb7b706cf9785d002d9c5a0e3 acf-lib-0.8.1.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openssh
pkgver=0.9.0
pkgver=0.10.1
pkgrel=0
pkgdesc="A web-based system administration interface for openssh"
url="http://git.alpinelinux.org/cgit/acf-openssh"
......@@ -14,6 +14,6 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
md5sums="86bd74ea42df65404951600d97afe7e3 acf-openssh-0.9.0.tar.xz"
sha256sums="8bcad5c2c0de9a559dc92df75f075f0b9595d46e0a57bc891b63552ec91e7a5b acf-openssh-0.9.0.tar.xz"
sha512sums="86c778037a1054523cc79729971e94a0a0939923bd8936e43a4f62adff3fb14cc96ea3ab8c81bca8307c2cee91e3d9dc2a4d073c0ad9126ed1420bac4235df0b acf-openssh-0.9.0.tar.xz"
md5sums="74645e8392552e451ea44a158502bf53 acf-openssh-0.10.1.tar.xz"
sha256sums="59923508d70e55eae263aa422ca0ea71d21dd16aca3916b2b5a614de8fcc58e9 acf-openssh-0.10.1.tar.xz"
sha512sums="99f924754b03b550cdf6f4ab09eb876ce8b7d7db1053ff0f1ed2da5c1856b1a2b163ae42aa7f308039bdc1bbe45903e91aea06fcae32758fa20d94bf86f32883 acf-openssh-0.10.1.tar.xz"
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-openssl
pkgver=0.10.0
pkgver=0.10.1
pkgrel=0
pkgdesc="A web-based system administration interface for openssl"
url="http://git.alpinelinux.org/cgit/acf-openssl"
......@@ -20,6 +20,6 @@ package() {
}
md5sums="66729bd5bb1ed4974341797034967126 acf-openssl-0.10.0.tar.xz"
sha256sums="d76fae545cd9fda729d9b18c32f6f0b5f5582c08d761fde89267fa0c5fff4834 acf-openssl-0.10.0.tar.xz"
sha512sums="ace8048a4b270da6573fa1aa210f0d0c653bb68d22fae999f657fb828dead2383d957d83de5dd3ab8d2c80184887f1106f35123fec7377dd799886322ab531b3 acf-openssl-0.10.0.tar.xz"
md5sums="69bbd58ab6af5a63aae675831a92f79b acf-openssl-0.10.1.tar.xz"
sha256sums="33d0572cfae24d96e9e355c11a57b1f3884a9196f1acee6c174bfd6bdc0a3776 acf-openssl-0.10.1.tar.xz"
sha512sums="bf885b78caa7757df2f2560155bc04c960c0f421f751a972ecf5ed40c8179a8ce0e94363d259e05a5cadc33df1389db96e2985149b4b760b378d371385946fb2 acf-openssl-0.10.1.tar.xz"
# Contributor: Seung Soo Mun <hamletmun@gmail.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-provisioning-algo
pkgver=2.4
pkgrel=1
pkgdesc="Files for provisioning Algo Products"
url="http://www.algosolutions.com/products/overview.html"
arch="noarch"
license="AS IS"
depends=""
makedepends=""
source="http://www.algosolutions.com/fw-downloads/8180/firmware/algo-8180-2.4.fw
http://www.algosolutions.com/fw-downloads/md5download.php?filename=8180/firmware/algo-8180-2.4.md5
http://www.algosolutions.com/fw-downloads/8180/kernel/algo-pa-kernel-r5.fw
http://www.algosolutions.com/fw-downloads/md5download.php?filename=8180/kernel/algo-pa-kernel-r5.md5
init.cfg.sample"
subpackages=""
package() {
cd "$srcdir"
mkdir -p "$pkgdir"/var/www/provisioning/htdocs/Algo
cp *.cfg.sample *.fw *.md5 "$pkgdir"/var/www/provisioning/htdocs/Algo
}
md5sums="1de8b7d5a475269cd0d4a56d030b2078 algo-8180-2.4.fw
6784fb98bb79d1730c64b8b7c09d67d6 algo-8180-2.4.md5
b48fcb591c7873a00b0d2323be771446 algo-pa-kernel-r5.fw
f7f6887a7cc92b46914f562612ba3841 algo-pa-kernel-r5.md5
7f6b26f11c1f81ac444c5c0f80e56212 init.cfg.sample"
sha256sums="10e58d5724a60a6628add20171c0d5f5792cd911e02d72927f7ec4ec9d474a47 algo-8180-2.4.fw
3261f7cd4b9bb143fae398e8da088a146c2ed74cf159377eedc99c68461abd8e algo-8180-2.4.md5
b59b62c6bfa79d1547fce02080aa78998248c9f6260599dc865c35ffbe47b8d8 algo-pa-kernel-r5.fw
cb46df70da381320cfdc47280687bf1660e50c0ebc3a2c276ea6c1c75b1f49eb algo-pa-kernel-r5.md5
51426dceb6e5f40cda289ca9bb034aac24e0a53f2c16aea3d03a05480134910b init.cfg.sample"
sha512sums="ec1ede724eb0485e0b92b0fdf4f969e03e067634be684bd2aa4d853ecaabf6837f12ca607f8bd9b6529932785e5ce26472b76ecf0a61d93a94d1d6ded2fe9ac0 algo-8180-2.4.fw
44df87dc2bf929a12133a40809b5ad1e1967cb70cd474b833a9c6c0b2ec83fe5d05d52350fc2575af4fa0a793fba099ba95d5b5d08d822a8739a320714d14ece algo-8180-2.4.md5
9282f2e4c2c178b08af66c86d27681484edc2d3729ebcf7786442f73f4d8ec4be42358b527dc38388fb3f68bc09ca666e6fc8be49cc1dbeb5c305ad9cebb14b8 algo-pa-kernel-r5.fw
f86db2a891c2097f26f58cd484b4fa05ce67387ecafbe8daa3f8dcbf851cdeeb22553fefa53acedefd89e98e25a3d3c9d0c4ac5e42e897a204ee9473ee340165 algo-pa-kernel-r5.md5
8ebb6ab8b0a288d3f08891654943988cbc42a08b113f4e72beb74e98de3b4b608f4dd904879dfb3d131f2225bfa6990478cc12cb00c0d872b53ebaa464d9f998 init.cfg.sample"
net.dscp.rtp = 101110
net.dscp.sip = 101110
net.vlan.id = 1
net.vlan.priority = 5
net.vlan.use = 1
prov.download.cfgpath = Algo
prov.download.fwgpath = Algo
prov.download.method = http
prov.server.method = static
prov.server.static = 10.0.0.1
prov.version.firmware = 2.4
prov.version.kernel = r5
sip.alert2.use = 1
audio.ring.tone2 = buzzer.wav
sip.alert3.use = 1
audio.ring.tone3 = chime.wav
sip.alert4.use = 1
audio.ring.tone4 = dogs.wav
sip.alert5.use = 1
audio.ring.tone5 = gong.wav
--- src/000000000000.cfg
+++ src/000000000000.cfg.new
@@ -3,18 +3,18 @@
@@ -3,18 +3,15 @@
<!-- For information on configuring Polycom VoIP phones please refer to the -->
<!-- Configuration File Management white paper available from: -->
<!-- http://www.polycom.com/common/documents/whitepapers/configuration_file_management_on_soundpoint_ip_phones.pdf -->
......@@ -18,13 +18,13 @@
- <APPLICATION_SPIP501 APP_FILE_PATH_SPIP501="sip_318.ld" CONFIG_FILES_SPIP501="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP600 APP_FILE_PATH_SPIP600="sip_318.ld" CONFIG_FILES_SPIP600="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP601 APP_FILE_PATH_SPIP601="sip_318.ld" CONFIG_FILES_SPIP601="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SPIP670 APP_FILE_PATH_SPIP670="sip_404.ld" CONFIG_FILES_SPIP670=""/>
- <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000="phone1_318.cfg, sip_318.cfg"/>
- <APPLICATION_SSIP6000 APP_FILE_PATH_SSIP6000="sip_404.ld" CONFIG_FILES_SSIP6000=""/>
- <APPLICATION_SSIP7000 APP_FILE_PATH_SSIP7000="sip_404.ld" CONFIG_FILES_SSIP7000=""/>
+ <APPLICATION_SPIP430 APP_FILE_PATH_SPIP430="sip_327.ld" CONFIG_FILES_SPIP430=""/>
+ <APPLICATION_SPIP501 APP_FILE_PATH_SPIP501="sip_318.ld" CONFIG_FILES_SPIP501=""/>
+ <APPLICATION_SPIP600 APP_FILE_PATH_SPIP600="sip_318.ld" CONFIG_FILES_SPIP600=""/>
+ <APPLICATION_SPIP601 APP_FILE_PATH_SPIP601="sip_318.ld" CONFIG_FILES_SPIP601=""/>
<APPLICATION_SPIP670 APP_FILE_PATH_SPIP670="sip_404.ld" CONFIG_FILES_SPIP670=""/>
- <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000="phone1_318.cfg, sip_318.cfg"/>
+ <APPLICATION_SSIP4000 APP_FILE_PATH_SSIP4000="sip_318.ld" CONFIG_FILES_SSIP4000=""/>
<APPLICATION_SSIP6000 APP_FILE_PATH_SSIP6000="sip_404.ld" CONFIG_FILES_SSIP6000=""/>
<APPLICATION_SSIP7000 APP_FILE_PATH_SSIP7000="sip_404.ld" CONFIG_FILES_SSIP7000=""/>
</APPLICATION>
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-provisioning-polycom
pkgver=5.3.0
pkgrel=1
pkgver=5.3.2
pkgrel=0
pkgdesc="Files for provisioning Polycom IP phones"
url="http://www.polycom.com/products/voice/index.html"
arch="noarch"
license="AS IS"
depends=""
makedepends=""
# Make sure 5.3.0 comes after 4.0.8c so that older files are overwritten
# Make sure 5.3.2 comes after 4.0.8c so that older files are overwritten
source="http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
http://downloads.polycom.com/voice/voip/uc/SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_5_3_0_rts37_release_sig_split.zip
http://downloads.polycom.com/voice/voip/uc/Polycom_UC_Software_5_3_2_release_sig_split.zip
000000000000.cfg.patch
000000000000-phone.cfg
000000000000-web.cfg
......@@ -85,22 +85,22 @@ default_unpack() {
md5sums="be6364402a35d4fc3f38d817a2bd5117 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
b5ac28a1b4ede82fca226675c0b6981d SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
7a354d76afaf5508935daa12576534ae Polycom_UC_Software_5_3_0_rts37_release_sig_split.zip
1f1c9b42d768b0b2753bc1eb8ce44157 000000000000.cfg.patch
be7694a0c852f528f4a17627d4cb1547 Polycom_UC_Software_5_3_2_release_sig_split.zip
a567851b650cf3e7a20f26ec3f63bf75 000000000000.cfg.patch
2c32486b7c9d692326fd6270664eac01 000000000000-phone.cfg
2c32486b7c9d692326fd6270664eac01 000000000000-web.cfg
4a6ff93b944a710da0c3eb99938f42cc 000000000000-directory.xml"
sha256sums="b2ffe49f306b071b9e04e1049b4293dda06e8e1e5c27fd129af31ec535cbd381 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
4565248f354321901323d01b1aeed8bb6e00beedc331a3f7545cbae83d194113 SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
1706670e43355faf105c80e7c652a8477449a851d58b1e225e81136fcd112799 Polycom_UC_Software_5_3_0_rts37_release_sig_split.zip
d3142732d52dde59b3937d8dd5871196ecd540c350af5ae4ca68e497c4439e09 000000000000.cfg.patch
eb8ddb122888996189525c5bba3ad076aa78eb8e551cc17ce9959bd198fb6dff Polycom_UC_Software_5_3_2_release_sig_split.zip
81346cdbafcd6e370debde74a2894ea93e777cff631b27321f3bf7300329bb60 000000000000.cfg.patch
e2f3dcd842d6eb44a98140e7fb60487ca70e519d5d09872a54ce1372d5a432b4 000000000000-phone.cfg
e2f3dcd842d6eb44a98140e7fb60487ca70e519d5d09872a54ce1372d5a432b4 000000000000-web.cfg
875f5bbec057d29508bcd671a203d8e2852cd959aeaeb937443cedbe824e0a41 000000000000-directory.xml"
sha512sums="1ca4b9975948f2266e299aa6a27c29554898af04ad07f6a76b6033b95473f915c4d96c132e9ab67cc32613f95a4433129f05a7c125dbd3a53b9c393e68c0e871 Polycom_UC_Software_4_0_8_Rev_C_release_sig_split.zip
b624b6618af41c21de016ead0746be9702834632e32de1bd62a5b47ad2308f0fb9def72fcfb35259731b7431d00a958e9c4ad3ad7d7257a29bba9e976dc70c4c SoundPoint_IP_BootROM_4_4_0B_Upgrader_release_sig.zip
0dec724f1dbd18a2c0af21c736a2771b5ccb4cb98e6fda43970ff091c3e8ac6af8d42d5334ecd82d06cbf6914ee8c1be4d3d5231fdf67a9225f22c27d4dbc8a9 Polycom_UC_Software_5_3_0_rts37_release_sig_split.zip
041499a8a8c1b145e2a5ba28ad41ebdf27b57bc01b6f4ea84f270a495b24bd68583b2b5b54ade302b51f350ebdbc4bb9f6d19116f4fda99d916bafb0407ac6a8 000000000000.cfg.patch
ecee627af77d41b3bce6b55c2908bbe85e78a494dc2cf925d5bae2eb033da1517e3e5601e3219a5a75fd8c1857b72bc62848d86283a0c6ea68abae17fc81306f Polycom_UC_Software_5_3_2_release_sig_split.zip
8ec2605c84f8e5db50fff0ed842dc965a10457d72d9672b176b680d5599e93947c0c6011513cacc84ff5f324df573d38e09ac7301b27f6dcac40af3c56392639 000000000000.cfg.patch
db2da0f4c393bdea773f3e5a7daa581a58caca738538db6153b223383176aae30e2081c198291d78c44eddd446a1cab9cffef78646360847ce4955c59f288300 000000000000-phone.cfg
db2da0f4c393bdea773f3e5a7daa581a58caca738538db6153b223383176aae30e2081c198291d78c44eddd446a1cab9cffef78646360847ce4955c59f288300 000000000000-web.cfg
9adc73d02aa4f545aca893c335284d77099c56fcc17a48f61003ede8713e96aeb8f467896f4dfbf7db67255cc3d60faf353b76ab86c5881d0ba884d1c0acffb3 000000000000-directory.xml"
......@@ -2,13 +2,13 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>