diff --git a/packages/network/libdnet/package.mk b/packages/network/libdnet/package.mk index 7f20d2bbe5..e5e7952f2b 100644 --- a/packages/network/libdnet/package.mk +++ b/packages/network/libdnet/package.mk @@ -1,45 +1,37 @@ ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2018-present Team LibreELEC # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # -# OpenELEC is free software: you can redistribute it and/or modify +# LibreELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# OpenELEC is distributed in the hope that it will be useful, +# LibreELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . +# along with LibreELEC. If not, see . ################################################################################ PKG_NAME="libdnet" -PKG_VERSION="1.12" -PKG_SHA256="83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026" +PKG_VERSION="8029bf9" +PKG_SHA256="1e41cbe5e4884108b08fa92964305354f1662b7e889f62736b3749845d7a8c56" PKG_ARCH="any" PKG_LICENSE="BSD" -PKG_SITE="http://code.google.com/p/libdnet/" -PKG_URL="http://libdnet.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tgz" +PKG_SITE="https://github.com/sgeto/libdnet" +PKG_URL="https://github.com/sgeto/libdnet/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="network" -PKG_SHORTDESC="A simplified, portable interface to several low-level networking routines" PKG_LONGDESC="A simplified, portable interface to several low-level networking routines" +PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_strlcat=no \ ac_cv_func_strlcpy=no \ --enable-static \ --disable-shared \ - --without-python" - -pre_configure_target() { - sed "s|@prefix@|$SYSROOT_PREFIX/usr|g" -i $PKG_BUILD/dnet-config.in -} - -post_makeinstall_target() { - mkdir -p $TOOLCHAIN/bin - cp dnet-config $TOOLCHAIN/bin/ -} + --disable-python" diff --git a/packages/network/libdnet/patches/00-fix_strlcpy_strlcat.patch b/packages/network/libdnet/patches/00-fix_strlcpy_strlcat.patch deleted file mode 100644 index a3deb0e48c..0000000000 --- a/packages/network/libdnet/patches/00-fix_strlcpy_strlcat.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -Naur libdnet-1.12/acconfig.h libdnet-1.12-patch/acconfig.h ---- libdnet-1.12/acconfig.h 2018-02-01 15:55:19.346009246 -0500 -+++ libdnet-1.12-patch/acconfig.h 2018-02-01 15:59:14.826008240 -0500 -@@ -20,11 +20,11 @@ - #endif - - #ifndef HAVE_STRLCAT --int strlcat(char *, const char *, int); -+size_t strlcat(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRLCPY --int strlcpy(char *, const char *, int); -+size_t strlcpy(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRSEP -diff -Naur libdnet-1.12/include/config.h.in libdnet-1.12-patch/include/config.h.in ---- libdnet-1.12/include/config.h.in 2018-02-01 15:51:57.346010109 -0500 -+++ libdnet-1.12-patch/include/config.h.in 2018-02-01 15:59:47.316008101 -0500 -@@ -282,11 +282,11 @@ - #endif - - #ifndef HAVE_STRLCAT --int strlcat(char *, const char *, int); -+size_t strlcat(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRLCPY --int strlcpy(char *, const char *, int); -+size_t strlcpy(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRSEP -diff -Naur libdnet-1.12/trunk/acconfig.h libdnet-1.12-patch/trunk/acconfig.h ---- libdnet-1.12/trunk/acconfig.h 2018-02-01 15:51:57.356010109 -0500 -+++ libdnet-1.12-patch/trunk/acconfig.h 2018-02-01 16:00:08.526008010 -0500 -@@ -20,11 +20,11 @@ - #endif - - #ifndef HAVE_STRLCAT --int strlcat(char *, const char *, int); -+size_t strlcat(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRLCPY --int strlcpy(char *, const char *, int); -+size_t strlcpy(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRSEP -diff -Naur libdnet-1.12/trunk/include/config.h.in libdnet-1.12-patch/trunk/include/config.h.in ---- libdnet-1.12/trunk/include/config.h.in 2018-02-01 15:51:57.356010109 -0500 -+++ libdnet-1.12-patch/trunk/include/config.h.in 2018-02-01 16:00:34.786007898 -0500 -@@ -282,11 +282,11 @@ - #endif - - #ifndef HAVE_STRLCAT --int strlcat(char *, const char *, int); -+size_t strlcat(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRLCPY --int strlcpy(char *, const char *, int); -+size_t strlcpy(char *, const char *, size_t); - #endif - - #ifndef HAVE_STRSEP