Fixed the relation and ordering for correct HTTP and SMTP socket activation, removed the gnu-netcat dependency by using systemd-socket-proxyd to forward socket-activated requests to mailcatcher, and fixed typo of pre_remove() install function.

10 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2f3d324f7e5..03f0890186ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Sun Apr  3 10:36:58 UTC 2016
+# Wed Apr  6 16:26:33 UTC 2016
 pkgbase = ruby-mailcatcher
 	pkgdesc = Catches mail and serves it through a dream.
 	pkgver = 0.6.1
-	pkgrel = 9
+	pkgrel = 10
 	url = http://mailcatcher.me
 	install = ruby-mailcatcher.install
 	arch = any
 	license = MIT
 	makedepends = rubygems
-	depends = gnu-netcat
 	depends = ruby-activesupport
 	depends = ruby-eventmachine
 	depends = ruby-haml
@@ -25,15 +24,15 @@ pkgbase = ruby-mailcatcher
 	source = http://gems.rubyforge.org/gems/mailcatcher-0.6.1.gem
 	source = mailcatcher.service
 	source = mailcatcher-http.socket
-	source = mailcatcher-http@.service
+	source = mailcatcher-http.service
 	source = mailcatcher-smtp.socket
-	source = mailcatcher-smtp@.service
+	source = mailcatcher-smtp.service
 	md5sums = bdeb5656e0931d1b211b52aa0f9e31f5
-	md5sums = cf357f9859b6f24210d07ccce7313879
-	md5sums = d21981c2877a578555bcd61c0c6bc718
-	md5sums = a8a07564d971bc1df3cc786cda27c333
-	md5sums = 99cb313118e735cd021e476111d9cd62
-	md5sums = 8e57104285979856653f99e5564b613d
+	md5sums = c6e70c3b5b061fb3e13ad56fea757b01
+	md5sums = e72d4a12219e7f0d52fa6095738ed9d5
+	md5sums = a3be575ff001fedc044ba43e6fdd31f7
+	md5sums = d0002eca814fbef980a058303a277634
+	md5sums = be35bfe4c621b7f2ff733e2c21bee54d
 
 pkgname = ruby-mailcatcher
 
diff --git a/PKGBUILD b/PKGBUILD
index b50e5ec06479..3bd157a8c07f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
 _pkgname=mailcatcher
 pkgname=ruby-$_pkgname
 pkgver=0.6.1
-pkgrel=9
+pkgrel=10
 pkgdesc='Catches mail and serves it through a dream.'
 arch=('any')
 url="http://$_pkgname.me"
 license=('MIT')
-depends=('gnu-netcat' 'ruby-activesupport' 'ruby-eventmachine' 'ruby-haml' 'ruby-mail' 'ruby-sinatra' 'ruby-skinny' 'ruby-sqlite3' 'ruby-thin')
+depends=('ruby-activesupport' 'ruby-eventmachine' 'ruby-haml' 'ruby-mail' 'ruby-sinatra' 'ruby-skinny' 'ruby-sqlite3' 'ruby-thin')
 makedepends=('rubygems')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -19,16 +19,16 @@ source=(
   "http://gems.rubyforge.org/gems/$_pkgname-$pkgver.gem"
   "$_pkgname.service"
   "$_pkgname-http.socket"
-  "$_pkgname-http@.service"
+  "$_pkgname-http.service"
   "$_pkgname-smtp.socket"
-  "$_pkgname-smtp@.service"
+  "$_pkgname-smtp.service"
 )
 md5sums=('bdeb5656e0931d1b211b52aa0f9e31f5'
-         'cf357f9859b6f24210d07ccce7313879'
-         'd21981c2877a578555bcd61c0c6bc718'
-         'a8a07564d971bc1df3cc786cda27c333'
-         '99cb313118e735cd021e476111d9cd62'
-         '8e57104285979856653f99e5564b613d')
+         'c6e70c3b5b061fb3e13ad56fea757b01'
+         'e72d4a12219e7f0d52fa6095738ed9d5'
+         'a3be575ff001fedc044ba43e6fdd31f7'
+         'd0002eca814fbef980a058303a277634'
+         'be35bfe4c621b7f2ff733e2c21bee54d')
 noextract=("$_pkgname-$pkgver.gem")
 
 package() {
@@ -45,7 +45,7 @@ package() {
   sed -i '/dependency(%q<thin>/{s/".*"/"~> 1"/}' $_gemspec
 
   # Install systemd units
-  for file in "$_pkgname"{.service,{-http,-smtp}{@.service,.socket}}; do
+  for file in "$_pkgname"{.service,{-http,-smtp}{.service,.socket}}; do
     install -Dm644 "$file" "$pkgdir/usr/lib/systemd/system/$file"
   done
 }
diff --git a/mailcatcher-http.service b/mailcatcher-http.service
new file mode 100644
index 000000000000..d371f2f032bf
--- /dev/null
+++ b/mailcatcher-http.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Mailcatcher HTTP Mapping Service
+Requires=mailcatcher.service
+After=mailcatcher.service
+
+[Service]
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd localhost:1080
diff --git a/mailcatcher-http.socket b/mailcatcher-http.socket
index 8cc6b0d14972..f33eb136c2e6 100644
--- a/mailcatcher-http.socket
+++ b/mailcatcher-http.socket
@@ -1,11 +1,9 @@
 [Unit]
 Description=Mailcatcher HTTP Activation Socket
-Requires=mailcatcher.service
-After=network.target mailcatcher.service
+After=network.target
 
 [Socket]
 ListenStream=80
-Accept=true
 
 [Install]
 WantedBy=sockets.target
diff --git a/mailcatcher-http@.service b/mailcatcher-http@.service
deleted file mode 100644
index 818a83c2a6c3..000000000000
--- a/mailcatcher-http@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Mailcatcher HTTP Mapping Service
-
-[Service]
-ExecStart=/usr/bin/nc localhost 1080
-StandardInput=socket
-StandardOutput=socket
diff --git a/mailcatcher-smtp.service b/mailcatcher-smtp.service
new file mode 100644
index 000000000000..a4fa4991f40b
--- /dev/null
+++ b/mailcatcher-smtp.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Mailcatcher SMTP Mapping Service
+Requires=mailcatcher.service
+After=mailcatcher.service
+
+[Service]
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd localhost:1025
diff --git a/mailcatcher-smtp.socket b/mailcatcher-smtp.socket
index fc52d54b68b5..b92f667a2cf2 100644
--- a/mailcatcher-smtp.socket
+++ b/mailcatcher-smtp.socket
@@ -1,11 +1,9 @@
 [Unit]
 Description=Mailcatcher SMTP Activation Socket
-Wants=mailcatcher.service
 After=network.target
 
 [Socket]
 ListenStream=25
-Accept=true
 
 [Install]
 WantedBy=sockets.target
diff --git a/mailcatcher-smtp@.service b/mailcatcher-smtp@.service
deleted file mode 100644
index a6fd1f914b7f..000000000000
--- a/mailcatcher-smtp@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Mailcatcher SMTP Mapping Service
-
-[Service]
-ExecStart=/usr/bin/nc localhost 1025
-StandardInput=socket
-StandardOutput=socket
diff --git a/mailcatcher.service b/mailcatcher.service
index 82fe83701891..ccf189cb4395 100644
--- a/mailcatcher.service
+++ b/mailcatcher.service
@@ -4,6 +4,7 @@ After=network.target
 
 [Service]
 ExecStart=/usr/bin/mailcatcher --ip localhost --http-port 1080 --smtp-port 1025 --foreground --verbose
+ExecStartPost=/usr/bin/sleep 1
 ExecStop=/usr/bin/curl --silent --get --request DELETE localhost:1080
 
 [Install]
diff --git a/ruby-mailcatcher.install b/ruby-mailcatcher.install
index b1cd3360d6cd..03c367fbb950 100644
--- a/ruby-mailcatcher.install
+++ b/ruby-mailcatcher.install
@@ -3,8 +3,8 @@ post_install() {
   echo ">>> Map port 25 (HTTP) and/or port 80 (SMTP) to mail catcher via socket actviation by using mailcatcher-smtp.socket and mailcatcher-http.socket."
 }
 
-pre_remote() {
-  for unit in mailcatcher{,.service,-{http,smtp}.socket}; do
+pre_remove() {
+  for unit in mailcatcher{.service,-{http,smtp}.{service,socket}}; do
     systemctl --quiet is-active $unit && systemctl stop $unit
     systemctl --quiet is-enabled $unit && systemctl disable $unit
   done