Switch to my repo; add post_install instructions

4 files changed, 21 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bfcad5ff1a5..4a6efff63322 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = irssi-passwd
 	pkgdesc = Modular text mode IRC client with Perl scripting, with irssi-passwd patch
 	pkgver = 1.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/swick/irssi-passwd
+	install = irssi-passwd.install
 	arch = x86_64
 	license = GPL
 	depends = glib2
@@ -13,15 +14,13 @@ pkgbase = irssi-passwd
 	backup = etc/irssi.conf
 	source = https://github.com/irssi/irssi/releases/download/1.2.0/irssi-1.2.0.tar.xz
 	source = https://github.com/irssi/irssi/releases/download/1.2.0/irssi-1.2.0.tar.xz.asc
-	source = https://raw.githubusercontent.com/swick/irssi-passwd/master/irssi-connection-set-key.patch
-	source = https://raw.githubusercontent.com/swick/irssi-passwd/master/passwd.pl
-	source = irssi-connection-set-key.patch.patch
+	source = https://raw.githubusercontent.com/gandalf3/irssi-passwd/master/irssi-connection-set-key.patch
+	source = https://raw.githubusercontent.com/gandalf3/irssi-passwd/master/passwd.pl
 	validpgpkeys = 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1
 	sha512sums = 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
 	sha512sums = SKIP
-	sha512sums = 9610c2207777cd3699a9af077fa41da2131ddb97b57c5420abb155e421ca619cd03d5c242b50437acf9bfc1242945fb6d245cbfe164c5a159b83baa439544b31
-	sha512sums = 0b6985f9db8c641997109d1ef1ca8d6ae87dbc9f68033062ecca020b5efb86f1f3c3f7e2cf3f3971f826e52b001838acef01553b38338ebdf948ee7bf14575d1
-	sha512sums = 77c88bf55624b9c164a2fd0e119bbba9188deba1f187da2d1ae680a0568eb2c7594dbcb8f9d8626e50c6d65e55c35a11e80f074ff4e7739c6bc083fe534066d1
+	sha512sums = b9be4bb568838fa2f31735b3290b31d6a88a9f31f1d6d1ac367391d951620ac0fcdbf664efa7fdbcc2ce181f2ff32bfa0ffc3146058836ec4ffcae9b3e11f36f
+	sha512sums = 8e5694e5dd56caac3fae268160e0d82544ce1ee8690972a5f502ac728cb189cd71baf09b14425c2d4d42bb799cc7336eb1a1258cc648bc3237906eb804da6092
 
 pkgname = irssi-passwd
 
diff --git a/PKGBUILD b/PKGBUILD
index 5deed69cfdfb..4f9d7cf6d57b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=irssi-passwd
 _pkgname=irssi
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Modular text mode IRC client with Perl scripting, with irssi-passwd patch'
 url='https://github.com/swick/irssi-passwd'
 arch=('x86_64')
@@ -14,22 +14,20 @@ license=('GPL')
 depends=('glib2' 'openssl' 'libotr')
 optdepends=('perl-libwww: for the scriptassist script')
 conflicts=('irssi')
+install=irssi-passwd.install
 backup=('etc/irssi.conf')
 source=(https://github.com/irssi/irssi/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.xz{,.asc}
-        https://raw.githubusercontent.com/swick/irssi-passwd/master/irssi-connection-set-key.patch
-        https://raw.githubusercontent.com/swick/irssi-passwd/master/passwd.pl
-        irssi-connection-set-key.patch.patch)
+        https://raw.githubusercontent.com/gandalf3/irssi-passwd/master/irssi-connection-set-key.patch
+        https://raw.githubusercontent.com/gandalf3/irssi-passwd/master/passwd.pl)
 sha512sums=('343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40'
             'SKIP'
-            '9610c2207777cd3699a9af077fa41da2131ddb97b57c5420abb155e421ca619cd03d5c242b50437acf9bfc1242945fb6d245cbfe164c5a159b83baa439544b31'
-            '0b6985f9db8c641997109d1ef1ca8d6ae87dbc9f68033062ecca020b5efb86f1f3c3f7e2cf3f3971f826e52b001838acef01553b38338ebdf948ee7bf14575d1'
-            '77c88bf55624b9c164a2fd0e119bbba9188deba1f187da2d1ae680a0568eb2c7594dbcb8f9d8626e50c6d65e55c35a11e80f074ff4e7739c6bc083fe534066d1')
+            'b9be4bb568838fa2f31735b3290b31d6a88a9f31f1d6d1ac367391d951620ac0fcdbf664efa7fdbcc2ce181f2ff32bfa0ffc3146058836ec4ffcae9b3e11f36f'
+            '8e5694e5dd56caac3fae268160e0d82544ce1ee8690972a5f502ac728cb189cd71baf09b14425c2d4d42bb799cc7336eb1a1258cc648bc3237906eb804da6092')
 validpgpkeys=('7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1') # The Irssi project <staff@irssi.org>
 
 build() {
   cd ${_pkgname}-${pkgver}
-  patch --follow-symlinks ${srcdir}/irssi-connection-set-key.patch < ${srcdir}/irssi-connection-set-key.patch.patch -o irssi-connection-set-key_patched.patch
-  patch -p1 < irssi-connection-set-key_patched.patch
+  patch -p1 < ${srcdir}/irssi-connection-set-key.patch
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/irssi-connection-set-key.patch.patch b/irssi-connection-set-key.patch.patch
deleted file mode 100644
index 830016ffdb76..000000000000
--- a/irssi-connection-set-key.patch.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-38,40c38,40
-< +	else if (strcmp(key, "ssl_cert") == 0) {
-< +		g_free_not_null(server->connrec->ssl_cert);
-< +		server->connrec->ssl_cert = g_strdup(value);
----
-> +	else if (strcmp(key, "tls_cert") == 0) {
-> +		g_free_not_null(server->connrec->tls_cert);
-> +		server->connrec->tls_cert = g_strdup(value);
-42,44c42,44
-< +	else if (strcmp(key, "ssl_pkey") == 0) {
-< +		g_free_not_null(server->connrec->ssl_pkey);
-< +		server->connrec->ssl_pkey = g_strdup(value);
----
-> +	else if (strcmp(key, "tls_pkey") == 0) {
-> +		g_free_not_null(server->connrec->tls_pkey);
-> +		server->connrec->tls_pkey = g_strdup(value);
-46,48c46,48
-< +	else if (strcmp(key, "ssl_cafile") == 0) {
-< +		g_free_not_null(server->connrec->ssl_cafile);
-< +		server->connrec->ssl_cafile = g_strdup(value);
----
-> +	else if (strcmp(key, "tls_cafile") == 0) {
-> +		g_free_not_null(server->connrec->tls_cafile);
-> +		server->connrec->tls_cafile = g_strdup(value);
-50,52c50,52
-< +	else if (strcmp(key, "ssl_capath") == 0) {
-< +		g_free_not_null(server->connrec->ssl_capath);
-< +		server->connrec->ssl_capath = g_strdup(value);
----
-> +	else if (strcmp(key, "tls_capath") == 0) {
-> +		g_free_not_null(server->connrec->tls_capath);
-> +		server->connrec->tls_capath = g_strdup(value);
-54,55c54,55
-< +	else if (strcmp(key, "use_ssl") == 0) {
-< +		server->connrec->use_ssl = (strcmp(value, "no") != 0);
----
-> +	else if (strcmp(key, "use_tls") == 0) {
-> +		server->connrec->use_tls = (strcmp(value, "no") != 0);
-57,58c57,58
-< +	else if (strcmp(key, "ssl_verify") == 0) {
-< +		server->connrec->ssl_verify = (strcmp(value, "no") != 0);
----
-> +	else if (strcmp(key, "tls_verify") == 0) {
-> +		server->connrec->tls_verify = (strcmp(value, "no") != 0);
diff --git a/irssi-passwd.install b/irssi-passwd.install
new file mode 100644
index 000000000000..157a51372cf4
--- /dev/null
+++ b/irssi-passwd.install
@@ -0,0 +1,8 @@
+
+post_install() {
+  echo "==> For password subtitution to work, you'll need to load the passwd.pl script in /usr/share/irssi/scripts/passwd.pl"
+  echo "==> You can do that manually with /run passwd.pl (or with scriptassist.pl, /script load passwd.pl) in irssi,"
+  echo "==> or you can have it load automatically by symlinking it into ~/.irssi/scripts/autorun:"
+  echo '==>   cd ~/.irssi/scripts/autorun'
+  echo '==>   ln -s /usr/share/irssi/scripts/passwd.pl'
+}