[arch-commits] Commit in amule/trunk (PKGBUILD amule-cryptopp6.patch amule.install)

[Antonio Rojas]

    Date: Tuesday, January 30, 2018 @ 22:46:24
  Author: arojas
Revision: 288341

crypto++ 6.0.0 rebuild

Added:
  amule/trunk/amule-cryptopp6.patch
Modified:
  amule/trunk/PKGBUILD
Deleted:
  amule/trunk/amule.install

-----------------------+
 PKGBUILD              |   23 +++++++++++++++--------
 amule-cryptopp6.patch |   11 +++++++++++
 amule.install         |   17 -----------------
 3 files changed, 26 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-30 21:02:17 UTC (rev 288340)
+++ PKGBUILD	2018-01-30 22:46:24 UTC (rev 288341)
@@ -8,7 +8,7 @@
 
 pkgname=amule
 pkgver=10990
-pkgrel=4
+pkgrel=5
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=(x86_64)
 url="http://www.amule.org"
@@ -15,15 +15,22 @@
 license=(GPL)
 depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs)
 makedepends=(git ccache boost)
-install=amule.install
 source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver"
-        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles)
-sha512sums=('SKIP'
-            '13dbaee96658ca34e76bfdcf1e65895a24b57bc64bb846ae50d3d64a2e65047d90c13c0b14a50947d0ff9ccf30c4764380da05383650995d3798981068b87ebd'
-            'fbb58e2d0229e72e2192eae724e812a158443dc8d465ce14f94c184bcb575079e5e568c24bfbd132d9a6edf8651e7d7c45ca2ce46209bd04e27948503f6bbcdc'
-            'aaeab784e3a0fa9bd296897024bdd550a1704be3d62aecb7be497a6c174cbbd8bc07bccc9652c9f98316209fc9fd6f801f9121f11d64e978185a2f0cb4b34549'
-            '1a16613bddda48a4c1c5489d9df8d796c7c2ffb1541e42e4c8b84d4598652f6a1a0305b39c3d40f376f816ad7b4a17d8079ed67203d90a21800352fba189a20a')
+        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles
+        amule-cryptopp6.patch)
+sha256sums=('SKIP'
+            '527a2cca6d56b8269722aafc77a89734f59a929f946f342bd0f69b256f9c7522'
+            'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+            'c4ca658ab4105b3b90e0bb3efcc8121eca1c4d873787db1ed4f637925c16d502'
+            'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d'
+            '84d5e913bf05c1819275f4fd27028856aeb31157debbca89f9b54132efe69575')
 
+prepare() {
+  cd amule
+
+  patch -p1 -i ../amule-cryptopp6.patch # Fix build with crypto++ 6.0
+}
+
 build() {
   cd amule
 

Added: amule-cryptopp6.patch
===================================================================
--- amule-cryptopp6.patch	                        (rev 0)
+++ amule-cryptopp6.patch	2018-01-30 22:46:24 UTC (rev 288341)
@@ -0,0 +1,11 @@
+--- amule/src/ClientCreditsList.cpp.orig	2018-01-30 22:28:29.951863645 +0000
++++ amule/src/ClientCreditsList.cpp	2018-01-30 22:30:05.725410074 +0000
+@@ -312,7 +312,7 @@
+ 		// calculate and store public key
+ 		CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
+ 		CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
+-		pubkey.DEREncode(asink);
++		pubkey.AccessMaterial().Save(asink);
+ 		m_nMyPublicKeyLen = asink.TotalPutLength();
+ 		asink.MessageEnd();
+ 	} catch (const CryptoPP::Exception& e) {

Deleted: amule.install
===================================================================
--- amule.install	2018-01-30 21:02:17 UTC (rev 288340)
+++ amule.install	2018-01-30 22:46:24 UTC (rev 288341)
@@ -1,17 +0,0 @@
-post_install() {
-  post_upgrade
-}
-
-_config_instructions() {
-  echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to"
-  echo "provide [ExternalConnect] configuration."
-  echo "You also need to specify amuleweb password."
-  echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information."
-  echo "amuleweb can be started as 'systemctl start amuleweb'."
-}
-
-post_upgrade() {
-  if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then
-    _config_instructions
-  fi
-}