Index: head/archivers/urbackup-client/Makefile =================================================================== --- head/archivers/urbackup-client/Makefile (revision 477966) +++ head/archivers/urbackup-client/Makefile (revision 477967) @@ -1,107 +1,122 @@ # $FreeBSD$ PORTNAME= urbackup-client DISTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION}/ MAINTAINER= freebsd@coombscloud.com COMMENT= Client component of the UrBackup backup system LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -USES= gettext dos2unix localbase +USES= dos2unix gettext localbase pkgconfig USE_RC_SUBR= urbackup_client USERS= urbackup GROUPS= urbackup GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-clientupdate +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` SUB_FILES= pkg-message urbackupclient.conf.sample-daemon WRKSRC= ${WRKDIR}/${DISTNAME}.0 OPTIONS_DEFINE= GUI OPTIONS_SUB= yes GUI_DESC= GTK2 Tray Icon GUI_USE= WX=3.0+ GUI_CONFIGURE_ON= --with-wx-config=${WX_CONFIG} GUI_CONFIGURE_OFF= --enable-headless CONFFILES= mariadbdump.conf \ mariadbxtrabackup.conf \ mariadbdump.conf \ postgresbase.conf \ postgresqldump.conf XPMFILES= backup-bad.xpm \ backup-no-recent.xpm \ backup-ok.xpm \ backup-progress.xpm \ backup-indexing.xpm \ backup-no-server.xpm \ backup-progress-pause.xpm + +post-patch: + @(cd ${WRKSRC} && ${REINPLACE_CMD} -E -e 's|[[:<:]]byte[[:>:]]|CryptoPP::byte|g' \ + cryptoplugin/AESDecryption.cpp \ + cryptoplugin/AESEncryption.cpp \ + cryptoplugin/AESGCMDecryption.cpp \ + cryptoplugin/AESGCMEncryption.cpp \ + cryptoplugin/CryptoFactory.cpp \ + cryptoplugin/ECDHKeyExchange.cpp \ + cryptoplugin/ZlibCompression.cpp \ + cryptoplugin/ZlibDecompression.cpp \ + md5.h \ + ) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts ${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup ${MKDIR} ${STAGEDIR}/var/urbackup/data ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientbackend \ ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC}/urbackupclient/backup_scripts && ${COPYTREE_BIN} . \ ${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf") ${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \ ${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample ${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf .for f in ${CONFFILES} ${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \ ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/client/data/updates_h.dat \ ${STAGEDIR}${PREFIX}/share/urbackup ${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 do-install-GUI-on: ${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientgui \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/client/data/logo1.png \ ${STAGEDIR}${PREFIX}/share/urbackup ${INSTALL_DATA} ${WRKSRC}/client/info.txt \ ${STAGEDIR}${PREFIX}/share/urbackup .for f in ${XPMFILES} ${INSTALL_DATA} ${WRKSRC}/client/data/${f} \ ${STAGEDIR}${PREFIX}/share/urbackup .endfor .for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs ${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/lang/${f} .endfor .for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs ${INSTALL_DATA} ${WRKSRC}/client/data/lang/${f}/urbackup.mo \ ${STAGEDIR}${PREFIX}/share/urbackup/lang/${f} .endfor .include Index: head/archivers/urbackup-server/Makefile =================================================================== --- head/archivers/urbackup-server/Makefile (revision 477966) +++ head/archivers/urbackup-server/Makefile (revision 477967) @@ -1,40 +1,53 @@ # $FreeBSD$ PORTNAME= urbackup-server DISTVERSION= 2.2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Server/${DISTVERSION}/ MAINTAINER= freebsd@coombscloud.com COMMENT= Server component of the UrBackup backup system LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/server-license.txt LIB_DEPENDS= libcryptopp.so:security/cryptopp \ - libcurl.so:ftp/curl + libcurl.so:ftp/curl -USES+= fakeroot +USES= fakeroot pkgconfig +USE_RC_SUBR= urbackup_server USERS= urbackup GROUPS= urbackup -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-packaging +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` -USE_RC_SUBR= urbackup_server - SUB_FILES= pkg-message urbackupsrv.conf.sample-daemon + +post-patch: + @(cd ${WRKSRC} && ${REINPLACE_CMD} -E -e 's|[[:<:]]byte[[:>:]]|CryptoPP::byte|g' \ + cryptoplugin/AESDecryption.cpp \ + cryptoplugin/AESEncryption.cpp \ + cryptoplugin/AESGCMDecryption.cpp \ + cryptoplugin/AESGCMEncryption.cpp \ + cryptoplugin/CryptoFactory.cpp \ + cryptoplugin/ECDHKeyExchange.cpp \ + cryptoplugin/ZlibCompression.cpp \ + cryptoplugin/ZlibDecompression.cpp \ + md5.h \ + ) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup ${INSTALL_DATA} ${WRKDIR}/urbackupsrv.conf.sample-daemon \ ${STAGEDIR}${PREFIX}/etc/urbackup/urbackupsrv.conf.sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${FILESDIR}/urbackupsrv.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupsrv.conf ${INSTALL_MAN} ${WRKSRC}/docs/urbackupsrv.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/audio/clementine-player/Makefile =================================================================== --- head/audio/clementine-player/Makefile (revision 477966) +++ head/audio/clementine-player/Makefile (revision 477967) @@ -1,212 +1,203 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= clementine DISTVERSIONPREFIX= v DISTVERSION= 1.3.1-441 DISTVERSIONSUFFIX= -gc01b7bc -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio PKGNAMESUFFIX= -player MAINTAINER= sbruno@FreeBSD.org COMMENT= Cross-platform music player based on Amarok 1.4 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs LIB_DEPENDS= libtag.so:audio/taglib \ libchromaprint.so:audio/chromaprint \ libprotobuf.so:devel/protobuf \ libqca.so:devel/qca@qt4 \ libqjson.so:devel/qjson@qt4 \ libfftw3.so:math/fftw3 \ libechonest.so:audio/libechonest \ libcryptopp.so:security/cryptopp BROKEN_powerpc64= fails to compile: tagreader.cpp: undefined reference to TagLib::String::String USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX} GH_PROJECT= Clementine USES= cmake \ compiler:c++11-lib \ desktop-file-utils \ gettext-tools \ pkgconfig \ qt:4 sqlite USE_GL= gl glew glu USE_XORG= x11 CONFLICTS_BUILD= qt-3.* USE_QT= corelib \ dbus \ gui \ imageformats \ qmake_build \ linguist_build \ moc_build \ network \ opengl \ qtestlib \ rcc_build \ sql \ uic_build \ webkit \ xml USE_GSTREAMER1= cdparanoia \ chromaprint \ faac \ faad \ flac \ lame \ mpg123 \ neon \ shout2 \ soup \ taglib \ twolame \ vorbis INSTALLS_ICONS= yes CFLAGS+= -Wno-inconsistent-missing-override \ -Wno-unused-variable \ -Wno-unused-function CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ -DENABLE_DBUS=ON \ - -DENABLE_SPOTIFY_BLOB=OFF \ - -DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \ - -DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ - -DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \ - -DCRYPTOPP_LDFLAGS=-lcryptopp \ - -DCRYPTOPP_LIBRARIES=cryptopp \ - -DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \ - -DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ - -DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \ - -DCRYPTOPP_FOUND=1 + -DENABLE_SPOTIFY_BLOB=OFF OPTIONS_DEFINE= AMAZON \ AUDIOCD \ BOX \ BREAKPAD \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ PULSEAUDIO \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV OPTIONS_SUB= yes AMAZON_DESC= Amazon Drive support AUDIOCD_DESC= Devices: Audio CD support BOX_DESC= Box Drive support BREAKPAD_DESC= Crash reporting DEVICEKIT_DESC= Devices: DeviceKit backend DROPBOX_DESC= Dropbox Support GIO_DESC= Devices: GIO device backend GOOGLE_DRIVE_DESC= Google Drive support GPOD_DESC= iPod support LASTFM_DESC= Support Last.fm service (requires ruby) MOODBAR_DESC= Moodbar Support MTP_DESC= MTP device support PULSEAUDIO_DESC= Enable Pulseaudio Support SKYDRIVE_DESC= Microsoft SkyDrive Support VISUALISATION_DESC= Visualisations from projectM WIIMOTEDEV_DESC= Wiimote support OPTIONS_DEFAULT= AMAZON \ AUDIOCD \ BOX \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV AMAZON_CMAKE_ON= -DENABLE_AMAZON_CLOUD_DRIVE=ON AMAZON_CMAKE_OFF= -DENABLE_AMAZON_CLOUD_DRIVE=OFF AUDIOCD_LIB_DEPENDS= libcdio.so:sysutils/libcdio AUDIOCD_CMAKE_ON= -DENABLE_AUDIOCD=ON AUDIOCD_CMAKE_OFF= -DENABLE_AUDIOCD=OFF BOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash BOX_CMAKE_ON= -DENABLE_BOX=ON BOX_CMAKE_OFF= -DENABLE_BOX=OFF BREAKPAD_CMAKE_ON= -DENABLE_BREAKPAD=ON BREAKPAD_CMAKE_OFF= -DENABLE_BREAKPAD=OFF DEVICEKIT_CMAKE_ON= -DENABLE_DEVICEKIT=ON DEVICEKIT_CMAKE_OFF= -DENABLE_DEVICEKIT=OFF DROPBOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash DROPBOX_CMAKE_ON= -DENABLE_DROPBOX=ON DROPBOX_CMAKE_OFF= -DENABLE_DROPBOX=OFF GIO_USE= GNOME=glib20 GIO_CMAKE_ON= -DENABLE_GIO=ON GIO_CMAKE_OFF= -DENABLE_GIO=OFF GOOGLE_DRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash GOOGLE_DRIVE_CMAKE_ON= -DENABLE_GOOGLE_DRIVE=ON GOOGLE_DRIVE_CMAKE_OFF= -DENABLE_GOOGLE_DRIVE=OFF GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libplist.so:devel/libplist \ libusbmuxd.so:comms/libusbmuxd \ libimobiledevice.so:comms/libimobiledevice GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF LASTFM_LIB_DEPENDS= liblastfm.so:audio/liblastfm LASTFM_CMAKE_ON= -DENABLE_LIBLASTFM=ON LASTFM_CMAKE_OFF= -DENABLE_LIBLASTFM=OFF MOODBAR_CMAKE_ON= -DENABLE_MOODBAR=ON MOODBAR_CMAKE_OFF= -DENABLE_MOODBAR=OFF MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_ON= -DENABLE_LIBMTP=ON MTP_CMAKE_OFF= -DENABLE_LIBMTP=OFF PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DENABLE_LIBPULSE=ON PULSEAUDIO_CMAKE_OFF= -DENABLE_LIBPULSE=OFF SKYDRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash SKYDRIVE_CMAKE_ON= -DENABLE_SKYDRIVE=ON SKYDRIVE_CMAKE_OFF= -DENABLE_SKYDRIVE=OFF VISUALISATION_CMAKE_ON= -DENABLE_VISUALISATIONS=ON VISUALISATION_CMAKE_OFF=-DENABLE_VISUALISATIONS=OFF WIIMOTEDEV_CMAKE_ON= -DENABLE_WIIMOTEDEV=ON WIIMOTEDEV_CMAKE_OFF= -DENABLE_WIIMOTEDEV=OFF .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-unknown-warning-option -Wno-undefined-var-template .endif .include Index: head/audio/clementine-player/files/patch-CMakeLists.txt =================================================================== --- head/audio/clementine-player/files/patch-CMakeLists.txt (nonexistent) +++ head/audio/clementine-player/files/patch-CMakeLists.txt (revision 477967) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-08-17 05:31:45 UTC ++++ CMakeLists.txt +@@ -59,7 +59,7 @@ find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a lib + + pkg_check_modules(CDIO libcdio) + pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint) +-pkg_search_module(CRYPTOPP cryptopp libcrypto++) ++pkg_check_modules(CRYPTOPP libcryptopp) + pkg_check_modules(GIO gio-2.0) + pkg_check_modules(GLIB REQUIRED glib-2.0) + pkg_check_modules(GOBJECT REQUIRED gobject-2.0) Property changes on: head/audio/clementine-player/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/clementine-player/files/patch-src_CMakeLists.txt =================================================================== --- head/audio/clementine-player/files/patch-src_CMakeLists.txt (revision 477966) +++ head/audio/clementine-player/files/patch-src_CMakeLists.txt (revision 477967) @@ -1,10 +1,18 @@ ---- src/CMakeLists.txt.orig 2016-04-19 15:08:35 UTC +--- src/CMakeLists.txt.orig 2018-05-23 13:23:53 UTC +++ src/CMakeLists.txt -@@ -1388,6 +1388,7 @@ add_executable(clementine +@@ -1295,6 +1295,7 @@ if(HAVE_BREAKPAD) + endif(HAVE_BREAKPAD) + + if(HAVE_SPOTIFY_DOWNLOADER) ++ add_definitions(${CRYPTOPP_CFLAGS_OTHER}) + target_link_libraries(clementine_lib + ${CRYPTOPP_LIBRARIES} + ) +@@ -1380,6 +1381,7 @@ add_executable(clementine if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") target_link_libraries(clementine execinfo) + set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player) endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") target_link_libraries(clementine Index: head/deskutils/cdcat/Makefile =================================================================== --- head/deskutils/cdcat/Makefile (revision 477966) +++ head/deskutils/cdcat/Makefile (revision 477967) @@ -1,88 +1,89 @@ # Created by: Aren Tyr # $FreeBSD$ PORTNAME= cdcat PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Qt based tool for offline CD/DVD/disk catalogs LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cryptopp>0:security/cryptopp LIB_DEPENDS= libtar.so:devel/libtar \ libexif.so:graphics/libexif \ libmediainfo.so:multimedia/libmediainfo \ - libzen.so:multimedia/libzen + libzen.so:multimedia/libzen \ + libcryptopp.so:security/cryptopp CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -USES= libtool qmake:norecursive qt:4 tar:bzip2 +USES= libtool pkgconfig qmake:norecursive qt:4 tar:bzip2 USE_QT= corelib gui xml linguisttools_build moc_build uic_build -QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ - LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ +QMAKE_ARGS= LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ + CONFIG+="link_pkgconfig" \ + PKGCONFIG+="libcryptopp" \ DEFINES+="MEDIAINFO_STATIC" \ DEFINES+="MEDIAINFO_UNICODE" \ DEFINES+="USE_LIBEXIF" QMAKE_SOURCE_PATH= ${BUILD_WRKSRC}/${PORTNAME}.pro INSTALLS_ICONS= yes PORTDOCS= Authors ChangeLog README TRANSLATORS_README PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.png .for lang in cz de el es fr hu id it pl pt ru sk sr PLIST_FILES+= %%DATADIR%%/translations/${PORTNAME}_${lang}.qm .endfor .for size in 16 22 32 48 64 PLIST_FILES+= share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png .endfor PLIST_FILES+= share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \ "${PORTNAME}" "AudioVideo;Qt;" "" OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ '/USE_LIB7ZIP/s|^|#| ; \ /LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro @${REINPLACE_CMD} -e \ 's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp .for i in newdbdialog.cpp wdbfile.h @${REINPLACE_CMD} -e \ 's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i} .endfor pre-configure: @${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \ ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm \ ${STAGEDIR}${DATADIR}/translations @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps .for size in 16 22 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/deskutils/cdcat/files/patch-src_wdbfile.h =================================================================== --- head/deskutils/cdcat/files/patch-src_wdbfile.h (nonexistent) +++ head/deskutils/cdcat/files/patch-src_wdbfile.h (revision 477967) @@ -0,0 +1,14 @@ +byte was moved into the CryptoPP namespace in version 6.0.0 +https://www.cryptopp.com/wiki/Std::byte + +--- src/wdbfile.h.orig 2018-08-13 23:12:09 UTC ++++ src/wdbfile.h +@@ -31,7 +31,7 @@ static CryptoPP::AutoSeededRandomPool prng; + + static CryptoPP::SecByteBlock crypto_key(CryptoPP::Blowfish::BLOCKSIZE); + +-static byte iv[CryptoPP::Blowfish::BLOCKSIZE]; ++static CryptoPP::byte iv[CryptoPP::Blowfish::BLOCKSIZE]; + + + int generate_cryptokey(QString password); Property changes on: head/deskutils/cdcat/files/patch-src_wdbfile.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/xeus/Makefile =================================================================== --- head/devel/xeus/Makefile (revision 477966) +++ head/devel/xeus/Makefile (revision 477967) @@ -1,28 +1,26 @@ # $FreeBSD$ PORTNAME= xeus DISTVERSION= 0.13.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ implementation of the Jupyter kernel protocol LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cppzmq>0:net/cppzmq \ nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack LIB_DEPENDS= libcryptopp.so:security/cryptopp \ - libuuid.so:misc/e2fsprogs-libuuid -RUN_DEPENDS= cppzmq>0:net/cppzmq \ - nlohmann-json>0:devel/nlohmann-json \ - xtl-quant-stack>0:devel/xtl-quant-stack + libuuid.so:misc/e2fsprogs-libuuid \ + libzmq.so:net/libzmq4 USES= cmake:outsource compiler:c++14-lang localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= QuantStack USE_LDCONFIG= yes .include Index: head/devel/xeus/files/patch-CMakeLists.txt =================================================================== --- head/devel/xeus/files/patch-CMakeLists.txt (revision 477966) +++ head/devel/xeus/files/patch-CMakeLists.txt (revision 477967) @@ -1,45 +1,51 @@ --- CMakeLists.txt.orig 2018-07-01 17:59:23 UTC +++ CMakeLists.txt -@@ -46,11 +46,12 @@ message(STATUS "xeus binary version: v${ +@@ -46,11 +46,12 @@ message(STATUS "xeus binary version: v${XEUS_BINARY_VE # Dependencies # ============ +FIND_PACKAGE(PkgConfig) find_package(nlohmann_json 3.1.1 REQUIRED) find_package(xtl 0.4 REQUIRED) -find_package(ZeroMQ 4.2.3 REQUIRED) --find_package(cppzmq 4.2.3 REQUIRED) --find_package(cryptopp REQUIRED) +pkg_check_modules(ZeroMQ libzmq>=4.2.3 REQUIRED) -+#find_package(cppzmq 4.2.3 REQUIRED) -+#find_package(cryptopp REQUIRED) + find_package(cppzmq 4.2.3 REQUIRED) +-find_package(cryptopp REQUIRED) ++pkg_check_modules(cryptopp libcryptopp REQUIRED) # Source files # ============ -@@ -108,10 +109,9 @@ add_library(xeus SHARED ${XEUS_SOURCES} - target_include_directories(xeus PUBLIC $ - $) - target_link_libraries(xeus -- PUBLIC cppzmq +@@ -111,7 +112,7 @@ target_link_libraries(xeus + PUBLIC cppzmq PUBLIC nlohmann_json PUBLIC xtl - PRIVATE cryptopp-static) -+ -lcryptopp) ++ PRIVATE cryptopp) if(NOT MSVC) if(APPLE) -@@ -139,10 +139,10 @@ include(CMakePushCheckState) +@@ -139,14 +140,12 @@ include(CMakePushCheckState) cmake_push_check_state() # HAVE_CRYPTOPP_BYTE_T -get_target_property(cryptopp_INCLUDE_DIR cryptopp-static INTERFACE_INCLUDE_DIRECTORIES) -get_target_property(cryptopp_LIBRARY cryptopp-static LOCATION) --set(CMAKE_REQUIRED_LIBRARIES ${cryptopp_LIBRARY}) --set(CMAKE_REQUIRED_INCLUDES ${cryptopp_INCLUDE_DIR}) -+#get_target_property(cryptopp_INCLUDE_DIR cryptopp INTERFACE_INCLUDE_DIRECTORIES) -+#get_target_property(cryptopp_LIBRARY cryptopp LOCATION) -+set(CMAKE_REQUIRED_LIBRARIES -lcryptopp) -+set(CMAKE_REQUIRED_INCLUDES -I/usr/local/include) + set(CMAKE_REQUIRED_LIBRARIES ${cryptopp_LIBRARY}) + set(CMAKE_REQUIRED_INCLUDES ${cryptopp_INCLUDE_DIR}) check_cxx_source_compiles(" #include \"cryptopp/config.h\" int main(){ +- [[maybe_unused]] CryptoPP::byte b = CryptoPP::byte{0x36}; ++ CryptoPP::byte b = (CryptoPP::byte){0x36}; + }" HAVE_CRYPTOPP_BYTE_T) + + cmake_pop_check_state() +@@ -206,7 +205,7 @@ if(MSVC) + elseif(APPLE) + target_compile_definitions(xeus PUBLIC -DGUID_CFUUID) + else() +- target_compile_definitions(xeus PUBLIC -DGUID_LIBUUID) ++ target_compile_definitions(xeus PUBLIC -DGUID_LIBUUID ${cryptopp_CFLAGS_OTHER}) + endif() + + # Examples Index: head/devel/xeus/files/patch-xeusConfig.cmake.in =================================================================== --- head/devel/xeus/files/patch-xeusConfig.cmake.in (revision 477966) +++ head/devel/xeus/files/patch-xeusConfig.cmake.in (revision 477967) @@ -1,17 +1,15 @@ ---- xeusConfig.cmake.in.orig 2018-08-17 22:53:12 UTC +--- xeusConfig.cmake.in.orig 2018-07-01 17:59:23 UTC +++ xeusConfig.cmake.in -@@ -20,11 +20,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_L +@@ -20,10 +20,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMA @XEUS_CONFIG_CODE@ include(CMakeFindDependencyMacro) +FIND_PACKAGE(PkgConfig) find_dependency(xtl 0.4) find_dependency(nlohmann_json 3.1.1) find_dependency(xtl 0.4) -find_dependency(ZeroMQ 4.2.3) --find_dependency(cppzmq 4.2.3) +pkg_check_modules(ZeroMQ libzmq>=4.2.3 REQUIRED) -+#find_dependency(cppzmq 4.2.3) + find_dependency(cppzmq 4.2.3) if(UNIX AND NOT APPLE) find_dependency(LibUUID) - endif() Index: head/devel/xeus-cling/Makefile =================================================================== --- head/devel/xeus-cling/Makefile (revision 477966) +++ head/devel/xeus-cling/Makefile (revision 477967) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= xeus-cling DISTVERSION= 0.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ Jupyter Kernel LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cppzmq>0:net/cppzmq \ cxxopts>0:devel/cxxopts \ - czmq>0:net/czmq \ - llvm-config:lang/cling + llvm-config:lang/cling \ + nlohmann-json>0:devel/nlohmann-json \ + xtl-quant-stack>0:devel/xtl-quant-stack LIB_DEPENDS= libclingInterpreter.so:lang/cling \ - libcryptopp.so:security/cryptopp \ libpugixml.so:textproc/pugixml \ libuuid.so:misc/e2fsprogs-libuuid \ libxeus.so:devel/xeus \ libzmq.so:net/libzmq4 USES= cmake:outsource compiler:c++14-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= QuantStack .include Index: head/devel/xeus-cling/files/patch-CMakeLists.txt =================================================================== --- head/devel/xeus-cling/files/patch-CMakeLists.txt (revision 477966) +++ head/devel/xeus-cling/files/patch-CMakeLists.txt (revision 477967) @@ -1,33 +1,20 @@ ---- CMakeLists.txt.orig 2018-08-15 11:38:48 UTC +--- CMakeLists.txt.orig 2018-08-19 15:08:49 UTC +++ CMakeLists.txt -@@ -11,6 +11,8 @@ project(xeus-cling) - - set(XCPP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) - -+link_directories(${CMAKE_INSTALL_PREFIX}/lib) -+ - # Versionning - # =========== - -@@ -102,10 +104,10 @@ add_definitions(-DLLVM_DIR="${LLVM_BINAR - ################ - - find_package(xeus 0.13 REQUIRED) --find_package(cppzmq 4.2.3 REQUIRED) -+#find_package(cppzmq 4.2.3 REQUIRED) +@@ -105,7 +105,7 @@ find_package(xeus 0.13 REQUIRED) + find_package(cppzmq 4.2.3 REQUIRED) find_package(pugixml REQUIRED) -find_package(Clang REQUIRED) +#find_package(Clang REQUIRED) find_package(Cling REQUIRED) find_package(cxxopts REQUIRED) -@@ -305,6 +307,8 @@ set(XCPP_TAGCONFS_DIR ${CMAKE_CURRENT_SO - install(DIRECTORY ${XCPP_TAGCONFS_DIR} - DESTINATION ${XCPP_CONF_DIR}) +@@ -177,7 +177,7 @@ set (XCPP_HEADERS + ) -+target_link_libraries(xeus-cling -lclangAST -lLLVMSupport -lzmq) -+ - # Add definitions for the kernel to find tagfiles. - add_definitions(-DXCPP_TAGFILES_DIR="${CMAKE_INSTALL_PREFIX}/${XCPP_DATA_DIR}/tagfiles") - add_definitions(-DXCPP_TAGCONFS_DIR="${CMAKE_INSTALL_PREFIX}/${XCPP_CONF_DIR}/tags.d") + set(LLVM_NO_DEAD_STRIP 1) +-set(LIBS clingInterpreter clingMetaProcessor clingUtils xeus pugixml cxxopts::cxxopts) ++set(LIBS clingInterpreter clingMetaProcessor clingUtils xeus pugixml cxxopts::cxxopts -lclangAST -lLLVMSupport) + set(XEUSCLING_TARGET xeus-cling) + add_executable(${XEUSCLING_TARGET} ${XEUSCLING_SRC}) + set_target_properties(${XEUSCLING_TARGET} PROPERTIES ENABLE_EXPORTS 1) Index: head/net-p2p/amule/Makefile =================================================================== --- head/net-p2p/amule/Makefile (revision 477966) +++ head/net-p2p/amule/Makefile (revision 477967) @@ -1,134 +1,131 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= amule PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2+ LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-devel-[0-9]* USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ tar:xz USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client AMULEDAEMON_DESC= Compile aMule daemon version AMULEGUI_DESC= Compile aMule remote GUI CAS_DESC= Compile aMule Statistics for console ED2K_DESC= Compile aMule ed2k links handler FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled AMULEGUI_CONFIGURE_ON= --enable-amule-gui CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k FILEVIEW_CONFIGURE_ON= --enable-fileview GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 qt:4 PLASMAMULE_USE= KDE=kdelibs QT=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include - -.if ${ARCH} == "i386" -CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -.endif .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif post-patch: @${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure post-patch-DOCS-off: @${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in post-patch-PLASMAMULE-on: @${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in post-install-FILEVIEW-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin .include Index: head/net-p2p/amule/files/patch-src_ClientCreditsList.cpp =================================================================== --- head/net-p2p/amule/files/patch-src_ClientCreditsList.cpp (nonexistent) +++ head/net-p2p/amule/files/patch-src_ClientCreditsList.cpp (revision 477967) @@ -0,0 +1,16 @@ +From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001 +From: Tommy Jerry Mairo +Date: Wed, 21 Mar 2018 19:56:28 +0100 +Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0 + +--- src/ClientCreditsList.cpp.orig 2016-09-16 07:55:06 UTC ++++ src/ClientCreditsList.cpp +@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() + // calculate and store public key + CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast(m_pSignkey)); + CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); +- pubkey.DEREncode(asink); ++ pubkey.GetMaterial().Save(asink); + m_nMyPublicKeyLen = asink.TotalPutLength(); + asink.MessageEnd(); + } catch (const CryptoPP::Exception& e) { Property changes on: head/net-p2p/amule/files/patch-src_ClientCreditsList.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/amule-devel/Makefile =================================================================== --- head/net-p2p/amule-devel/Makefile (revision 477966) +++ head/net-p2p/amule-devel/Makefile (revision 477967) @@ -1,143 +1,141 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= amule PORTVERSION= 10998 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel DISTNAME= aMule-SVN-r${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-[0-9]* USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ tar:bzip2 USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp` LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS PLASMAMULE UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client AMULEDAEMON_DESC= Compile aMule daemon version AMULEGUI_DESC= Compile aMule remote GUI CAS_DESC= Compile aMule Statistics for console ED2K_DESC= Compile aMule ed2k links handler FILEVIEW_DESC= Compile file viewer for console MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled AMULEGUI_CONFIGURE_ON= --enable-amule-gui CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k FILEVIEW_CONFIGURE_ON= --enable-fileview GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 qt:4 PLASMAMULE_USE= KDE=kdelibs QT=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WEBSERVER_LIB_DEPENDS= libpng.so:graphics/png WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include - -.if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) -CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM -.endif .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ARGS+= --enable-optimize .endif post-patch: .SILENT ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif post-install: .if ${PORT_OPTIONS:MFILEVIEW} ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/security/cryptopp/Makefile =================================================================== --- head/security/cryptopp/Makefile (revision 477966) +++ head/security/cryptopp/Makefile (revision 477967) @@ -1,124 +1,108 @@ # Created by: George Reid # $FreeBSD$ -# Minor version bumps may not be ABI compatible and deskutils/cdcat -# links to the static library, so bump PORTREVISION of dependent -# ports when appropriate. - PORTNAME= cryptopp -PORTVERSION= 5.6.5 -PORTREVISION= 5 +PORTVERSION= 7.0.0 CATEGORIES= security MASTER_SITES= http://www.cryptopp.com/ DISTNAME= cryptopp${PORTVERSION:S/.//g} MAINTAINER= jhale@FreeBSD.org COMMENT= Free C++ class library of Cryptographic Primitives LICENSE= BSL LICENSE_FILE= ${WRKSRC}/License.txt BROKEN_powerpc= does not compile; unrecognized C++ options USES= cpe gmake zip USE_LDCONFIG= yes CPE_PRODUCT= crypto++ CPE_VENDOR= cryptopp EXTRACT_BEFORE_ARGS= -aq NO_WRKSUBDIR= yes CXXFLAGS+= -Wno-deprecated-declarations -fPIC MAKEFILE= GNUmakefile -ALL_TARGET= static shared +ALL_TARGET= static shared libcryptopp.pc SOVERSION= ${PORTVERSION:R:R} PLIST_SUB+= SOVERSION=${SOVERSION} \ PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG THREADS TOOLS OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT= THREADS TOOLS OPTIONS_SUB= yes # Always compile with -DNDEBUG for release. Otherwise, sensitive # information could be accessed if an assert triggers. # See ${WRKSRC}/Readme.txt for more details. FULL_DEBUG_DESC= Build with full debugging support (SECURITY RISK!!!) FULL_DEBUG_CXXFLAGS= -DCRYPTOPP_DEBUG FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG FULL_DEBUG_IMPLIES= DEBUG # Disable this option to run the regression tests. TOOLS_DESC= Install encryption/decryption tools TOOLS_MAKE_ENV= CRYPTOPP_DATA_DIR=${DATADIR}/ TOOLS_ALL_TARGET= cryptest.exe TOOLS_TEST_TARGET_OFF= test THREADS_LDFLAGS= -lpthread .include .if ${PORT_OPTIONS:MSIMD} -. if ${MACHINE_CPU:Msse2} -USES+= compiler:c++14-lang -CXXFLAGS+= -msse2 -. else +. if !${MACHINE_CPU:Msse2} CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 . endif -. if ${MACHINE_CPU:Msse3} && ${MACHINE_CPU:Mssse3} -CXXFLAGS+= -msse3 -mssse3 -. else -CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE3 +. if !${MACHINE_CPU:Mssse3} +CXXFLAGS+= -DCRYPTOPP_DISABLE_SSSE3 . endif -. if ${MACHINE_CPU:Msse41} && ${MACHINE_CPU:Msse42} -CXXFLAGS+= -msse4.1 -msse4.2 -. else +. if !${MACHINE_CPU:Msse41} CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE4 . endif .else -CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 \ + -DCRYPTOPP_DISABLE_SSSE3 -DCRYPTOPP_DISABLE_SSE4 .endif -.include - -.if ${PORT_OPTIONS:MSIMD} && ${MACHINE_CPU:Msse2} && ${CHOSEN_COMPILER_TYPE} == gcc -USE_GCC= yes -.endif - pre-configure-FULL_DEBUG-on: @${ECHO_CMD} @${ECHO_CMD} "----------------------------- WARNING!!! ----------------------------" @${ECHO_CMD} "You have chosen to compile with full debugging support. If an assert" @${ECHO_CMD} "triggers, sensitive information could possibly be egressed to the" @${ECHO_CMD} "filesystem via a core dump. If this is not your intention, hit CTRL-C" @${ECHO_CMD} "now and run 'make config clean' and disable the FULL_DEBUG option." @${ECHO_CMD} "---------------------------------------------------------------------" @${ECHO_CMD} . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 10 . endif do-install: ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${SOVERSION} ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so + ${INSTALL_DATA} ${WRKSRC}/libcryptopp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig @${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp (for i in `${FIND} ${WRKSRC}/ -name '*.h' \ -and -not -name 'dll.h' \ -and -not -name 'resource.h'`; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \ done) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README do-install-TOOLS-on: @${MKDIR} ${STAGEDIR}${DATADIR}/TestData ${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest ${INSTALL_DATA} ${WRKSRC}/TestData/usage.dat ${STAGEDIR}${DATADIR}/TestData -.include +.include Index: head/security/cryptopp/distinfo =================================================================== --- head/security/cryptopp/distinfo (revision 477966) +++ head/security/cryptopp/distinfo (revision 477967) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480818667 -SHA256 (cryptopp565.zip) = a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 -SIZE (cryptopp565.zip) = 4220843 +TIMESTAMP = 1534123149 +SHA256 (cryptopp700.zip) = a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0 +SIZE (cryptopp700.zip) = 7296665 Index: head/security/cryptopp/files/patch-config.h =================================================================== --- head/security/cryptopp/files/patch-config.h (revision 477966) +++ head/security/cryptopp/files/patch-config.h (nonexistent) @@ -1,33 +0,0 @@ -The definition of CRYPTOPP_BOOL_ALIGN16_ENABLED was incorrect for i386. -For NetBSD, this resulted in the inability to build cryptopp on i386. -On FreeBSD, it built, but deskutils/cdcat choked on it while building on -FreeBSD 10/i386 and FreeBSD 11/i386. (PR: 192199) - ---- config.h.orig 2016-10-10 23:49:54 UTC -+++ config.h -@@ -534,12 +534,6 @@ NAMESPACE_END - # endif - #endif - --#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) -- #define CRYPTOPP_BOOL_ALIGN16 1 --#else -- #define CRYPTOPP_BOOL_ALIGN16 0 --#endif -- - // how to allocate 16-byte aligned memory (for SSE2) - #if defined(CRYPTOPP_MSVC6PP_OR_LATER) - #define CRYPTOPP_MM_MALLOC_AVAILABLE -@@ -553,6 +547,12 @@ NAMESPACE_END - #define CRYPTOPP_NO_ALIGNED_ALLOC - #endif - -+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC) -+ #define CRYPTOPP_BOOL_ALIGN16 1 -+#else -+ #define CRYPTOPP_BOOL_ALIGN16 0 -+#endif -+ - // Apple always provides 16-byte aligned, and tells us to use calloc - // http://developer.apple.com/library/mac/documentation/Performance/Conceptual/ManagingMemory/Articles/MemoryAlloc.html - Property changes on: head/security/cryptopp/files/patch-config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/cryptopp/files/patch-GNUmakefile =================================================================== --- head/security/cryptopp/files/patch-GNUmakefile (revision 477966) +++ head/security/cryptopp/files/patch-GNUmakefile (revision 477967) @@ -1,40 +1,24 @@ ---- GNUmakefile.orig 2016-10-10 23:49:54 UTC +We need to export the CRYPTOPP_DISABLE_ASM flag if cryptopp was not built +with SIMD support. Certain functions prototypes are guarded by this +flag and build failures will arise in other ports if not set appropriately. + +--- GNUmakefile.orig 2018-04-08 08:47:12 UTC +++ GNUmakefile -@@ -41,7 +41,7 @@ SUNCC_511_OR_LATER := $(shell $(CXX) -V - SUNCC_512_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[2-9]|5\.[2-9]|6\.)") - SUNCC_513_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") +@@ -90,7 +90,7 @@ SUNCC_512_OR_LATER := $(shell echo "$(SUNCC_VERSION)" + SUNCC_513_OR_LATER := $(shell echo "$(SUNCC_VERSION)" | $(GREP) -i -c -E "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") + # Enable shared object versioning for Linux -HAS_SOLIB_VERSION := $(IS_LINUX) +HAS_SOLIB_VERSION := 1 # Fixup SunOS ifeq ($(IS_SUN),1) -@@ -126,11 +126,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS - endif +@@ -957,7 +957,7 @@ libcryptopp.pc: + @echo 'Version: 7.0' >> libcryptopp.pc + @echo 'URL: https://cryptopp.com/' >> libcryptopp.pc + @echo '' >> libcryptopp.pc +- @echo 'Cflags: -I$${includedir}' >> libcryptopp.pc ++ @echo 'Cflags: -I$${includedir} $(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS))' >> libcryptopp.pc + @echo 'Libs: -L$${libdir} -lcryptopp' >> libcryptopp.pc - # Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else - # GCC 3.3 and "unknown option -march=" - # Ubuntu GCC 4.1 compiler crash with -march=native - # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -@@ -140,7 +135,6 @@ else - else ifeq ($(SUN_COMPILER)$(IS_X86),01) - CXXFLAGS += -m32 - endif # X86/X32/X64 --endif - - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) -@@ -404,7 +398,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) - # Full version suffix for shared library - SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) - # Different patchlevels are compatible, minor versions are not --SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) -+SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) - SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif # HAS_SOLIB_VERSION - + # This recipe prepares the distro files Index: head/security/cryptopp/files/patch-cpu.h =================================================================== --- head/security/cryptopp/files/patch-cpu.h (nonexistent) +++ head/security/cryptopp/files/patch-cpu.h (revision 477967) @@ -0,0 +1,17 @@ +Fix build with SIMD on FreeBSD 10.x + +--- cpu.h.orig 2018-04-08 08:47:11 UTC ++++ cpu.h +@@ -614,7 +614,12 @@ inline int GetCacheLineSize() + #define GNU_AS2(x, y) #x ", " #y ";" NEW_LINE + #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" NEW_LINE + #define GNU_ASL(x) "\n" #x ":" NEW_LINE ++ // clang 5.0.0 and apple clang 9.0.0 don't support numerical backward jumps ++#if (CRYPTOPP_LLVM_CLANG_VERSION >= 30000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 90000) ++ #define GNU_ASJ(x, y, z) ATT_PREFIX ";" NEW_LINE #x " " #y #z ";" NEW_LINE INTEL_PREFIX ";" NEW_LINE ++#else + #define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE ++#endif + #define AS1(x) GNU_AS1(x) + #define AS2(x, y) GNU_AS2(x, y) + #define AS3(x, y, z) GNU_AS3(x, y, z) Property changes on: head/security/cryptopp/files/patch-cpu.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/cryptopp/files/patch-misc.h =================================================================== --- head/security/cryptopp/files/patch-misc.h (revision 477966) +++ head/security/cryptopp/files/patch-misc.h (revision 477967) @@ -1,62 +1,60 @@ This fixes a warning triggered by testing an unsigned parameter against 0. The patch solves this by creating a different template for signed case. (PR: 178827) ---- misc.h.orig 2016-10-10 23:49:54 UTC +--- misc.h.orig 2018-04-08 08:47:11 UTC +++ misc.h -@@ -529,8 +529,10 @@ inline bool SafeConvert(T1 from, T2 &to) - //! \param value the value to convert - //! \param base the base to use during the conversion - //! \returns the string representation of value in base. +@@ -572,8 +572,10 @@ inline bool SafeConvert(T1 from, T2 &to) + /// \param value the value to convert + /// \param base the base to use during the conversion + /// \returns the string representation of value in base. +template struct IsUnsigned {}; + template -std::string IntToString(T value, unsigned int base = 10) +std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) { // Hack... set the high bit for uppercase. static const unsigned int HIGH_BIT = (1U << 31); -@@ -541,12 +543,6 @@ std::string IntToString(T value, unsigne +@@ -584,12 +586,6 @@ std::string IntToString(T value, unsigned int base = 1 if (value == 0) return "0"; - bool negate = false; - if (value < 0) - { - negate = true; - value = 0-value; // VC .NET does not like -a - } std::string result; while (value > 0) { -@@ -554,11 +550,30 @@ std::string IntToString(T value, unsigne +@@ -597,9 +593,28 @@ std::string IntToString(T value, unsigned int base = 1 result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result; value /= base; } + return result; +} + +template +std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) +{ + bool negate = false; + if (value < 0) + { + negate = true; + value = 0-value; // VC .NET does not like -a + } + std::string result = IntToStringImpl(value, base, IsUnsigned()); if (negate) result = "-" + result; return result; - } - ++} ++ +template +std::string IntToString(T value, unsigned int base = 10) +{ + return IntToStringImpl(value, base, IsUnsigned<(static_cast(-1) > 0)>()); -+} -+ - //! \brief Converts an unsigned value to a string - //! \param value the value to convert - //! \param base the base to use during the conversion + } + + /// \brief Converts an unsigned value to a string Index: head/security/cryptopp/files/patch-sse-simd.cpp =================================================================== --- head/security/cryptopp/files/patch-sse-simd.cpp (nonexistent) +++ head/security/cryptopp/files/patch-sse-simd.cpp (revision 477967) @@ -0,0 +1,13 @@ +Fix build without SIMD on FreeBSD 10.x + +--- sse-simd.cpp.orig 2018-04-08 08:47:12 UTC ++++ sse-simd.cpp +@@ -23,7 +23,7 @@ + #endif + + // Needed by SunCC and MSVC +-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) ++#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && defined(CRYPTOPP_SSE2_ASM_AVAILABLE) + # include + #endif + Property changes on: head/security/cryptopp/files/patch-sse-simd.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/cryptopp/pkg-plist =================================================================== --- head/security/cryptopp/pkg-plist (revision 477966) +++ head/security/cryptopp/pkg-plist (revision 477967) @@ -1,150 +1,169 @@ %%TOOLS%%bin/cryptest include/cryptopp/3way.h include/cryptopp/adler32.h +include/cryptopp/adv-simd.h include/cryptopp/aes.h include/cryptopp/algebra.h include/cryptopp/algparam.h include/cryptopp/arc4.h include/cryptopp/argnames.h +include/cryptopp/aria.h include/cryptopp/asn.h include/cryptopp/authenc.h include/cryptopp/base32.h include/cryptopp/base64.h include/cryptopp/basecode.h include/cryptopp/bench.h include/cryptopp/blake2.h include/cryptopp/blowfish.h include/cryptopp/blumshub.h include/cryptopp/camellia.h include/cryptopp/cast.h include/cryptopp/cbcmac.h include/cryptopp/ccm.h include/cryptopp/chacha.h include/cryptopp/channels.h include/cryptopp/cmac.h include/cryptopp/config.h include/cryptopp/cpu.h include/cryptopp/crc.h include/cryptopp/cryptlib.h include/cryptopp/default.h include/cryptopp/des.h include/cryptopp/dh.h include/cryptopp/dh2.h include/cryptopp/dmac.h +include/cryptopp/drbg.h include/cryptopp/dsa.h include/cryptopp/eax.h include/cryptopp/ec2n.h include/cryptopp/eccrypto.h include/cryptopp/ecp.h +include/cryptopp/ecpoint.h include/cryptopp/elgamal.h include/cryptopp/emsa2.h include/cryptopp/eprecomp.h include/cryptopp/esign.h include/cryptopp/factory.h include/cryptopp/fhmqv.h include/cryptopp/files.h include/cryptopp/filters.h include/cryptopp/fips140.h include/cryptopp/fltrimpl.h include/cryptopp/gcm.h include/cryptopp/gf256.h include/cryptopp/gf2_32.h include/cryptopp/gf2n.h include/cryptopp/gfpcrypt.h include/cryptopp/gost.h include/cryptopp/gzip.h +include/cryptopp/hashfwd.h include/cryptopp/hex.h include/cryptopp/hkdf.h include/cryptopp/hmac.h include/cryptopp/hmqv.h include/cryptopp/hrtimer.h include/cryptopp/ida.h include/cryptopp/idea.h include/cryptopp/integer.h include/cryptopp/iterhash.h +include/cryptopp/kalyna.h include/cryptopp/keccak.h include/cryptopp/lubyrack.h include/cryptopp/luc.h include/cryptopp/mars.h include/cryptopp/md2.h include/cryptopp/md4.h include/cryptopp/md5.h include/cryptopp/mdc.h include/cryptopp/mersenne.h include/cryptopp/misc.h include/cryptopp/modarith.h include/cryptopp/modes.h include/cryptopp/modexppc.h include/cryptopp/mqueue.h include/cryptopp/mqv.h +include/cryptopp/naclite.h include/cryptopp/nbtheory.h include/cryptopp/network.h include/cryptopp/nr.h include/cryptopp/oaep.h include/cryptopp/oids.h include/cryptopp/osrng.h include/cryptopp/ossig.h +include/cryptopp/padlkrng.h include/cryptopp/panama.h include/cryptopp/pch.h include/cryptopp/pkcspad.h +include/cryptopp/poly1305.h include/cryptopp/polynomi.h +include/cryptopp/ppc-simd.h include/cryptopp/pssr.h include/cryptopp/pubkey.h include/cryptopp/pwdbased.h include/cryptopp/queue.h include/cryptopp/rabin.h include/cryptopp/randpool.h include/cryptopp/rc2.h include/cryptopp/rc5.h include/cryptopp/rc6.h include/cryptopp/rdrand.h include/cryptopp/rijndael.h include/cryptopp/ripemd.h include/cryptopp/rng.h include/cryptopp/rsa.h include/cryptopp/rw.h include/cryptopp/safer.h include/cryptopp/salsa.h +include/cryptopp/scrypt.h include/cryptopp/seal.h include/cryptopp/secblock.h include/cryptopp/seckey.h include/cryptopp/seed.h include/cryptopp/serpent.h include/cryptopp/serpentp.h include/cryptopp/sha.h include/cryptopp/sha3.h include/cryptopp/shacal2.h include/cryptopp/shark.h +include/cryptopp/simon.h include/cryptopp/simple.h +include/cryptopp/siphash.h include/cryptopp/skipjack.h +include/cryptopp/sm3.h +include/cryptopp/sm4.h include/cryptopp/smartptr.h include/cryptopp/socketft.h include/cryptopp/sosemanuk.h +include/cryptopp/speck.h include/cryptopp/square.h include/cryptopp/stdcpp.h include/cryptopp/strciphr.h include/cryptopp/tea.h +include/cryptopp/threefish.h include/cryptopp/tiger.h include/cryptopp/trap.h include/cryptopp/trdlocal.h include/cryptopp/trunhash.h include/cryptopp/ttmac.h +include/cryptopp/tweetnacl.h include/cryptopp/twofish.h include/cryptopp/validate.h include/cryptopp/vmac.h include/cryptopp/wait.h include/cryptopp/wake.h include/cryptopp/whrlpool.h include/cryptopp/winpipes.h include/cryptopp/words.h include/cryptopp/xtr.h include/cryptopp/xtrcrypt.h include/cryptopp/zdeflate.h include/cryptopp/zinflate.h include/cryptopp/zlib.h lib/libcryptopp.a lib/libcryptopp.so lib/libcryptopp.so.%%SOVERSION%% lib/libcryptopp.so.%%PORTVERSION%% +libdata/pkgconfig/libcryptopp.pc %%TOOLS%%%%DATADIR%%/TestData/usage.dat %%PORTDOCS%%%%DOCSDIR%%/README