remove patches accepted upstream

6 files changed, 6 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42e4fc4c1852..b605bdac51a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,16 @@
 pkgbase = nodejs-vinefeed
 	pkgdesc = RSS/Atom feed generator for Vine users
-	pkgver = 0.1.0
-	pkgrel = 2
+	pkgver = 0.1.0.r11
+	pkgrel = 1
 	url = http://github.com/tremby/vinefeed
 	arch = any
 	license = GPL
 	makedepends = git
 	depends = nodejs
 	depends = npm
-	provides = nodejs-vinefeed=0.1.0
+	provides = nodejs-vinefeed=0.1.0.r11
 	conflicts = nodejs-vinefeed
-	source = vinefeed.service
-	source = vinefeed.socket
-	source = binary.patch
-	source = socket-activation.patch
 	source = nodejs-vinefeed::git+http://github.com/tremby/vinefeed
-	md5sums = e91569a2035064f52e321653ba26172e
-	md5sums = 0de7e38748a53ec8d96c2dd645e8bb2e
-	md5sums = 8b8cd5d387347f3632a80827b161bd76
-	md5sums = 8f4df9f6102f3078bebe89213320492a
 	md5sums = SKIP
 
 pkgname = nodejs-vinefeed
diff --git a/PKGBUILD b/PKGBUILD
index dc70abee502c..71f989e205ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,13 @@
 _npmname=vinefeed
 pkgname="nodejs-$_npmname"
-pkgver=0.1.0
-pkgrel=2
+pkgver=0.1.0.r11
+pkgrel=1
 pkgdesc="RSS/Atom feed generator for Vine users"
 arch=(any)
 url="http://github.com/tremby/vinefeed"
 license=('GPL')
 depends=('nodejs' 'npm')
 optdepends=()
-source=("$_npmname".{service,socket}
-        'binary.patch'
-        'socket-activation.patch')
-md5sums=('e91569a2035064f52e321653ba26172e'
-         '0de7e38748a53ec8d96c2dd645e8bb2e'
-         '8b8cd5d387347f3632a80827b161bd76'
-         '8f4df9f6102f3078bebe89213320492a')
 
 makedepends+=('git')
 source+=("${_gitname:=${pkgname%-git}}::${_giturl:-git+$url}")
@@ -22,12 +15,6 @@ md5sums+=('SKIP')
 provides+=("$_gitname=$pkgver")
 conflicts+=("$_gitname")
 
-prepare() {
-  cd "$_gitname"
-  patch -p1 -i ../binary.patch
-  patch -F3 -p1 -i ../socket-activation.patch
-}
-
 pkgver() {
   cd "$_gitname"
   grep -Po '(?<="version": ").*(?=")' package.json | tr '\n' '.'
@@ -35,9 +22,8 @@ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-  install -Dt "$pkgdir/usr/lib/systemd/user/" "$_npmname".{service,socket}
-
   cd "$_gitname"
   npm install -g --prefix "$pkgdir/usr" --production
+  install -Dt "$pkgdir/usr/lib/systemd/user/" "$_npmname".{service,socket}
   rmdir "$pkgdir/usr/etc"
 }
diff --git a/binary.patch b/binary.patch
deleted file mode 100644
index 90d4e9f3fa9c..000000000000
--- a/binary.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c7539765342141914309e9d6f4441a014b18ae7 Mon Sep 17 00:00:00 2001
-From: XZS <d.f.fischer@web.de>
-Date: Fri, 15 Jul 2016 13:57:54 +0200
-Subject: [PATCH] declare binary
-
-This makes it globally accessible after installation through npm.
----
- package.json | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/package.json b/package.json
-index 7506238..0d68fcb 100644
---- a/package.json
-+++ b/package.json
-@@ -10,5 +10,8 @@
-     "minimist": "^1.1.0",
-     "morgan": "^1.3.2",
-     "request": "^2.45.0"
-+  },
-+  "bin": {
-+    "vinefeed": "bin/www"
-   }
- }
--- 
-2.9.0
diff --git a/socket-activation.patch b/socket-activation.patch
deleted file mode 100644
index d760a589ce93..000000000000
--- a/socket-activation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7748985cddfe59a6243fefce4a3f6d8547032ec5 Mon Sep 17 00:00:00 2001
-From: XZS <d.f.fischer@web.de>
-Date: Fri, 15 Jul 2016 13:56:11 +0200
-Subject: [PATCH] support socket activation through systemd
-
-When run as a standalone server, it can be helpful to have vinefeed
-activated on demand.
----
- bin/www      | 2 +-
- package.json | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/bin/www b/bin/www
-index 06a579f..58016fb 100755
---- a/bin/www
-+++ b/bin/www
-@@ -13,5 +13,5 @@ app.set 'port', process.env.PORT
- 
- console.log "Environment: #{app.get('env')}"
- 
--server = app.listen app.get('port'), ->
-+server = app.listen require('systemd-socket')() || app.get('port'), ->
- 	console.log "Listening on port #{server.address().port}"
-diff --git a/package.json b/package.json
-index 7506238..43a19b5 100644
---- a/package.json
-+++ b/package.json
-@@ -9,6 +9,7 @@
-     "feed": "^0.2.6",
-     "minimist": "^1.1.0",
-     "morgan": "^1.3.2",
--    "request": "^2.45.0"
-+    "request": "^2.45.0",
-+    "systemd-socket": "^0.0.0"
-   }
- }
--- 
-2.9.0
diff --git a/vinefeed.service b/vinefeed.service
deleted file mode 100644
index 044370f58df8..000000000000
--- a/vinefeed.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Vine Atom feed HTTP server
-
-[Service]
-Environment=NODE_ENV=production
-ExecStart=/usr/bin/vinefeed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/vinefeed.socket b/vinefeed.socket
deleted file mode 100644
index 9708c677cf7c..000000000000
--- a/vinefeed.socket
+++ /dev/null
@@ -1,5 +0,0 @@
-[Socket]
-ListenStream=3000
-
-[Install]
-WantedBy=sockets.target