Browse Source

ocserv: updated to 0.11.7

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
lilik-openwrt-22.03
Nikos Mavrogiannopoulos 8 years ago
parent
commit
1c02217420
2 changed files with 3 additions and 50 deletions
  1. +3
    -3
      net/ocserv/Makefile
  2. +0
    -47
      net/ocserv/patches/001-makefile-fix.patch

+ 3
- 3
net/ocserv/Makefile View File

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ocserv PKG_NAME:=ocserv
PKG_VERSION:=0.11.6
PKG_RELEASE:=2
PKG_VERSION:=0.11.7
PKG_RELEASE:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/ PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/
PKG_MD5SUM:=0e4f82d267d27f2f9d3fcba58ac6cf5a
PKG_MD5SUM:=4c47b039bfaf1cecea6a2206dfe0ccd6
PKG_LICENSE:=GPLv2+ PKG_LICENSE:=GPLv2+
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING


+ 0
- 47
net/ocserv/patches/001-makefile-fix.patch View File

@ -1,47 +0,0 @@
diff --git a/src/Makefile.am b/src/Makefile.am
index 5943a50..4b2c77c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,18 +23,7 @@ noinst_LIBRARIES = libcmd-ocserv.a libipc.a
libcmd_ocserv_a_SOURCES = ocserv-args.def ocserv-args.c ocserv-args.h
ocserv-args.c: $(srcdir)/ocserv-args.def $(builddir)/version.inc
- if test "$(AUTOGEN)" = ":";then \
- rm -f $(builddir)/ocserv-args.c; \
- rm -f $(builddir)/ocserv-args.h; \
- cp $(srcdir)/autogen/ocserv-args.c $(builddir)/; \
- cp $(srcdir)/autogen/ocserv-args.h $(builddir)/; \
- else \
- $(AUTOGEN) $<; \
- if test -d $(srcdir)/autogen;then \
- cp $(builddir)/ocserv-args.c $(srcdir)/autogen; \
- cp $(builddir)/ocserv-args.h $(srcdir)/autogen; \
- fi; \
- fi
+ $(AUTOGEN) $<
ocserv-args.h: ocserv-args.c
# Authentication module sources
diff --git a/src/ocpasswd/Makefile.am b/src/ocpasswd/Makefile.am
index 97e2491..6304607 100644
--- a/src/ocpasswd/Makefile.am
+++ b/src/ocpasswd/Makefile.am
@@ -21,17 +21,6 @@ ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT) $(CODE_COVERAGE_LDFLAGS) \
$(LIBNETTLE_LIBS)
args.c: $(srcdir)/args.def $(builddir)/../version.inc
- if test "$(AUTOGEN)" = ":";then \
- rm -f $(builddir)/args.c; \
- rm -f $(builddir)/args.h; \
- cp $(srcdir)/../autogen/ocpasswd-args.c $(builddir)/args.c; \
- cp $(srcdir)/../autogen/ocpasswd-args.h $(builddir)/args.h; \
- else \
- $(AUTOGEN) $<; \
- if test -d $(srcdir)/autogen;then \
- cp $(builddir)/args.c $(srcdir)/../autogen/ocpasswd-args.c; \
- cp $(builddir)/args.h $(srcdir)/../autogen/ocpasswd-args.h; \
- fi; \
- fi
+ $(AUTOGEN) $<
args.h: args.c

Loading…
Cancel
Save