Andreas Wacknitz
2024-03-24 63c348b0fbe8a8eb0f1099db9ee52c69b0604689
libtorrent: re-add string manipulation patch which is still needed according to alp; switch to openssl-3.1; drop 32 bit

1 files deleted
1 files added
4 files modified
434 ■■■■ changed files
components/library/libtorrent/Makefile 24 ●●●● patch | view | raw | blame | history
components/library/libtorrent/libtorrent.license 342 ●●●●● patch | view | raw | blame | history
components/library/libtorrent/libtorrent.p5m 22 ●●●●● patch | view | raw | blame | history
components/library/libtorrent/manifests/sample-manifest.p5m 7 ●●●● patch | view | raw | blame | history
components/library/libtorrent/patches/string_manip.patch 30 ●●●●● patch | view | raw | blame | history
components/library/libtorrent/pkg5 9 ●●●●● patch | view | raw | blame | history
components/library/libtorrent/Makefile
@@ -24,30 +24,35 @@
# Copyright 2020, Aurelien Larcher 
#
BUILD_BITS=32_and_64
USE_OPENSSL11=yes
BUILD_BITS= 64
USE_PARALLEL_BUILD= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        libtorrent
COMPONENT_VERSION=    0.13.8
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_SUMMARY=    libtorrent - a Bittorrent library for rtorrent
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://rakshasa.github.io/rtorrent/
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983
COMPONENT_ARCHIVE_URL=    http://rtorrent.net/downloads/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_FMRI=            library/libtorrent
COMPONENT_LICENSE=        GPLv2
COMPONENT_LICENSE_FILE=    COPYING
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PREP_ACTION = \
        (cd $(@D) && \
        autoreconf -f -I./scripts -I. )
COMPONENT_PREP_ACTION = ( \
    cd $(@D) && \
    PATH="$(PATH)" sh autogen.sh )
COMPONENT_PRE_CONFIGURE_ACTION = \
        ($(CLONEY) $(SOURCE_DIR) $(@D))
# this is needed or we can't compile the rak headers
CC=$(CXX)
CC= $(CXX)
CXXFLAGS += -std=c++11
CXXFLAGS += $(gcc_OPT)
@@ -58,8 +63,6 @@
LDFLAGS += -lnsl -lsocket
LDFLAGS += -lz
unexport SHELLOPTS
CONFIGURE_OPTIONS  +=    --enable-shared
CONFIGURE_OPTIONS  +=    --disable-debug
CONFIGURE_OPTIONS  +=    --disable-static
@@ -69,11 +72,10 @@
COMPONENT_TEST_ENV +=    "LDFLAGS=-lnsl -lcppunit -lsocket -lz"
COMPONENT_TEST_TRANSFORMS = $(CONFIGURE_TEST_TRANSFORMS)
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
components/library/libtorrent/libtorrent.license
File was deleted
components/library/libtorrent/libtorrent.p5m
@@ -21,19 +21,19 @@
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/libtorrent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="libtorrent - a Bittorrent library for rtorrent"
set name=com.oracle.info.description value="the bittorrent library for rtorrent"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.arc-caseid \
    value=PSARC/2009/336
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license libtorrent.license license='GPLv2'
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
file libtorrent.3 path=usr/share/man/man3/libtorrent.3
file path=usr/include/torrent/bitfield.h
file path=usr/include/torrent/chunk_manager.h
@@ -103,9 +103,3 @@
link path=usr/lib/$(MACH64)/libtorrent.so.21 target=libtorrent.so.21.0.0
file path=usr/lib/$(MACH64)/libtorrent.so.21.0.0
file path=usr/lib/$(MACH64)/pkgconfig/libtorrent.pc
link path=usr/lib/libtorrent.so target=libtorrent.so.21.0.0
link path=usr/lib/libtorrent.so.21 target=libtorrent.so.21.0.0
file path=usr/lib/libtorrent.so.21.0.0
file path=usr/lib/pkgconfig/libtorrent.pc
file libtorrent.3 path=usr/share/man/man3/libtorrent.3
components/library/libtorrent/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2020 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -90,7 +91,3 @@
link path=usr/lib/$(MACH64)/libtorrent.so.21 target=libtorrent.so.21.0.0
file path=usr/lib/$(MACH64)/libtorrent.so.21.0.0
file path=usr/lib/$(MACH64)/pkgconfig/libtorrent.pc
link path=usr/lib/libtorrent.so target=libtorrent.so.21.0.0
link path=usr/lib/libtorrent.so.21 target=libtorrent.so.21.0.0
file path=usr/lib/libtorrent.so.21.0.0
file path=usr/lib/pkgconfig/libtorrent.pc
components/library/libtorrent/patches/string_manip.patch
New file
@@ -0,0 +1,30 @@
--- libtorrent-0.13.3/rak/string_manip.h.orig    2013-10-04 22:39:31.185674832 +0400
+++ libtorrent-0.13.3/rak/string_manip.h    2013-10-04 22:40:52.599710992 +0400
@@ -190,9 +190,10 @@
 OutputIterator
 copy_escape_html(InputIterator first, InputIterator last, OutputIterator dest) {
   while (first != last) {
-    if (std::isalpha(*first, std::locale::classic()) ||
-        std::isdigit(*first, std::locale::classic()) ||
-        *first == '-') {
+    if (isascii(*first)&&
+         (std::isalpha(*first, std::locale::classic()) ||
+          std::isdigit(*first, std::locale::classic()) ||
+          *first == '-')) {
       *(dest++) = *first;
     } else {
@@ -211,9 +212,10 @@
 OutputIterator
 copy_escape_html(InputIterator first1, InputIterator last1, OutputIterator first2, OutputIterator last2) {
   while (first1 != last1) {
-    if (std::isalpha(*first1, std::locale::classic()) ||
-        std::isdigit(*first1, std::locale::classic()) ||
-        *first1 == '-') {
+    if (isascii(*first1)&&
+          (std::isalpha(*first1, std::locale::classic()) ||
+          std::isdigit(*first1, std::locale::classic()) ||
+          *first1 == '-')) {
       if (first2 == last2) break; else *(first2++) = *first1;
     } else {
components/library/libtorrent/pkg5
@@ -1,14 +1,13 @@
{
    "dependencies": [
        "SUNWcs",
        "library/security/openssl-11",
        "library/security/openssl-31",
        "library/zlib",
        "system/library",
        "system/library/g++-7-runtime",
        "system/library/gcc-7-runtime"
        "system/library/g++-13-runtime",
        "system/library/gcc-13-runtime"
    ],
    "fmris": [
        "library/libtorrent"
    ],
    "name": "libtorrent"
}
}