summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Nikolai Viessmann2021-09-05 12:49:19 +0200
committerHans-Nikolai Viessmann2021-09-05 12:49:19 +0200
commit02f03e846883f597388d93367e6aa41cf117ed20 (patch)
treeb1d6a1cffeca2f43f9491e8a7c9d2f83b52456a9
parente99b4e3c793f3265631e50884e75dfd8c7cd0b7c (diff)
downloadaur-02f03e846883f597388d93367e6aa41cf117ed20.tar.gz
new revision; add https patch
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
-rw-r--r--moc-https.patch10
3 files changed, 22 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8373509de0f6..b00bd4f52194 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = moc-pulse-svn
pkgdesc = An ncurses console audio player with support for pulseaudio (SVN)
- pkgver = r2994
+ pkgver = r3005
pkgrel = 1
url = http://moc.daper.net
arch = i686
@@ -34,8 +34,9 @@ pkgbase = moc-pulse-svn
options = !libtool
source = moc-pulse-svn::svn://daper.net/moc/trunk
source = 0001-Pulseaudio-backend.patch
+ source = moc-https.patch
sha1sums = SKIP
sha1sums = d86a04606eaa0960f3b59626070cd231d37b6430
+ sha1sums = e3362ddd41126e2be874cd372a053fdaccf0f616
pkgname = moc-pulse-svn
-
diff --git a/PKGBUILD b/PKGBUILD
index f410b37c7120..68abfb762b68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-#Maintainer: Hans-Nikolai Viessmann <hv15 AT hw.ac.uk>
+#Maintainer: Hans-Nikolai Viessmann <hans AT viess DOT mn>
#Contributor: Øyvind 'MrElendig' Heggstad <mrelendig@har-ikkje.net>
#Contributor: jsteel <mail at jsteel dot org>
_pkgname=moc
pkgname="${_pkgname}-pulse-svn"
-pkgver=r2994
+pkgver=r3005
pkgrel=1
pkgdesc='An ncurses console audio player with support for pulseaudio (SVN)'
url='http://moc.daper.net'
@@ -24,9 +24,11 @@ conflicts=('moc')
provides=('moc')
options=('!libtool')
source=("${pkgname}::svn://daper.net/moc/trunk"
- '0001-Pulseaudio-backend.patch')
+ '0001-Pulseaudio-backend.patch'
+ 'moc-https.patch')
sha1sums=('SKIP'
- 'd86a04606eaa0960f3b59626070cd231d37b6430')
+ 'd86a04606eaa0960f3b59626070cd231d37b6430'
+ 'e3362ddd41126e2be874cd372a053fdaccf0f616')
pkgver() {
cd "$srcdir/$pkgname"
@@ -36,6 +38,9 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
+
+ # Allow https for urls https://moc.daper.net/node/1872 (taken from official release on ArchLinux)
+ patch -p0 -i ../moc-https.patch
# Add pulseaudio backend
patch -p1 -i ../0001-Pulseaudio-backend.patch
diff --git a/moc-https.patch b/moc-https.patch
new file mode 100644
index 000000000000..5ff304df944f
--- /dev/null
+++ b/moc-https.patch
@@ -0,0 +1,10 @@
+--- files.c.orig
++++ files.c
+@@ -93,6 +93,7 @@
+ inline int is_url (const char *str)
+ {
+ return !strncasecmp (str, "http://", sizeof ("http://") - 1)
++ || !strncasecmp (str, "https://", sizeof ("https://") - 1)
+ || !strncasecmp (str, "ftp://", sizeof ("ftp://") - 1);
+ }
+