summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxsmile2018-06-04 15:20:28 +0200
committerxsmile2018-06-04 15:20:28 +0200
commit2887d2c2b0f9ab5ab6808300e33caacfc51751ab (patch)
tree9a3c07722eff3941964a457a5fa1077d72e6f7f9
parentf816462d312ef4d041fc7bf5645f59768ef751db (diff)
downloadaur-2887d2c2b0f9ab5ab6808300e33caacfc51751ab.tar.gz
update
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--lt-ps-better-bencode-errors_all.patch40
3 files changed, 55 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index acc0d06f5723..eea9248ab1e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libtorrent-ps
pkgdesc = BitTorrent library written in C++ for use with rtorrent-ps
- pkgver = 1.0.r185.g11b26b7
+ pkgver = 1.0.r272.g388cfab
pkgrel = 1
url = https://github.com/rakshasa/libtorrent
arch = any
@@ -10,11 +10,13 @@ pkgbase = libtorrent-ps
conflicts = libtorrent
source = https://github.com/rakshasa/libtorrent/archive/0.13.6.tar.gz
source = lt-base-cppunit-pkgconfig.patch
+ source = lt-ps-better-bencode-errors_all.patch
source = lt-ps-honor_system_file_allocate_all.patch
source = lt-ps-log_open_file-reopen_all.patch
source = lt-open-ssl-1.1.patch
md5sums = 8c8eaa9fa03bd113967c68eea26493e7
md5sums = 198fb1fe53aa35eb97d16f9a8b9556bd
+ md5sums = dfae06b33afa738211619040810be8b4
md5sums = 8d7f8fe5ad412bd42f2ea66131a8ce6b
md5sums = 2bfadac7770935ca98c4714c2011541a
md5sums = 1fc8eca467b3e5a5b5c43bbef21f4ba8
diff --git a/PKGBUILD b/PKGBUILD
index dd6c1d1a84f9..d3ff38e066e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=libtorrent
pkgname=libtorrent-ps
_pkgver=0.13.6
-pkgver=1.0.r185.g11b26b7
+pkgver=1.0.r272.g388cfab
pkgrel=1
pkgdesc='BitTorrent library written in C++ for use with rtorrent-ps'
url='https://github.com/rakshasa/libtorrent'
@@ -14,11 +14,13 @@ provides=('libtorrent')
conflicts=('libtorrent')
source=("https://github.com/rakshasa/$_pkgname/archive/$_pkgver.tar.gz"
'lt-base-cppunit-pkgconfig.patch'
+ 'lt-ps-better-bencode-errors_all.patch'
'lt-ps-honor_system_file_allocate_all.patch'
'lt-ps-log_open_file-reopen_all.patch'
'lt-open-ssl-1.1.patch')
md5sums=('8c8eaa9fa03bd113967c68eea26493e7'
'198fb1fe53aa35eb97d16f9a8b9556bd'
+ 'dfae06b33afa738211619040810be8b4'
'8d7f8fe5ad412bd42f2ea66131a8ce6b'
'2bfadac7770935ca98c4714c2011541a'
'1fc8eca467b3e5a5b5c43bbef21f4ba8')
@@ -26,14 +28,20 @@ md5sums=('8c8eaa9fa03bd113967c68eea26493e7'
prepare() {
cd "$srcdir/$_pkgname-$_pkgver"
- LT_BASE_PATCHES=( "$srcdir"/lt-open-ssl-1.1.patch "$srcdir"/lt-base-cppunit-pkgconfig.patch )
- LT_PATCHES=( )
+ LT_BASE_PATCHES=("$srcdir"/lt-base-cppunit-pkgconfig.patch
+ "$srcdir"/lt-open-ssl-1.1.patch)
+ LT_PATCHES=()
# Patch libtorrent
- for corepatch in "${LT_BASE_PATCHES[@]}" "$srcdir"/lt-ps-*_{"${_pkgver}",all}.patch "${LT_PATCHES[@]}"; do
+ for corepatch in "${LT_BASE_PATCHES[@]}" \
+ "$srcdir"/lt-ps-*_{${_pkgver},all}.patch "${LT_PATCHES[@]}"; do
test ! -e "$corepatch" || { msg2 "$(basename $corepatch)"; patch -uNp1 -i "$corepatch"; }
done
+ for backport in "$srcdir"/backport*_{${_pkgver},all}_*.patch; do
+ test ! -e "$backport" || { msg2 "$(basename $backport)"; patch -uNp1 -i "$backport"; }
+ done
+
./autogen.sh
}
diff --git a/lt-ps-better-bencode-errors_all.patch b/lt-ps-better-bencode-errors_all.patch
new file mode 100644
index 000000000000..6cfd192b70cf
--- /dev/null
+++ b/lt-ps-better-bencode-errors_all.patch
@@ -0,0 +1,40 @@
+diff --git a/src/torrent/object_raw_bencode.h b/src/torrent/object_raw_bencode.h
+index 5e82fff8..4f49386a 100644
+--- a/src/torrent/object_raw_bencode.h
++++ b/src/torrent/object_raw_bencode.h
+@@ -156,7 +156,7 @@ public:
+ inline std::string
+ raw_bencode::as_value_string() const {
+ if (!is_value())
+- throw bencode_error("Wrong object type.");
++ throw bencode_error("Wrong object type - not a value.");
+
+ return std::string(data() + 1, size() - 2);
+ }
+@@ -164,7 +164,7 @@ raw_bencode::as_value_string() const {
+ inline raw_string
+ raw_bencode::as_raw_string() const {
+ if (!is_raw_string())
+- throw bencode_error("Wrong object type.");
++ throw bencode_error("Wrong object type - not a raw string.");
+
+ const_iterator itr = std::find(begin(), end(), ':');
+
+@@ -177,7 +177,7 @@ raw_bencode::as_raw_string() const {
+ inline raw_list
+ raw_bencode::as_raw_list() const {
+ if (!is_raw_list())
+- throw bencode_error("Wrong object type.");
++ throw bencode_error("Wrong object type - not a raw list.");
+
+ return raw_list(m_data + 1, m_size - 2);
+ }
+@@ -185,7 +185,7 @@ raw_bencode::as_raw_list() const {
+ inline raw_map
+ raw_bencode::as_raw_map() const {
+ if (!is_raw_map())
+- throw bencode_error("Wrong object type.");
++ throw bencode_error("Wrong object type - not a raw map.");
+
+ return raw_map(m_data + 1, m_size - 2);
+ }