From patchwork Sun Jan 18 11:45:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hanno X-Patchwork-Id: 430180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 12ACC1401AC for ; Sun, 18 Jan 2015 22:45:38 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2162A28BDF8; Sun, 18 Jan 2015 12:43:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CD287280172 for ; Sun, 18 Jan 2015 12:43:09 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-pd0-f169.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 18 Jan 2015 12:43:08 +0100 (CET) Received: by mail-pd0-f169.google.com with SMTP id z10so31128865pdj.0 for ; Sun, 18 Jan 2015 03:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=znNbcN/qRS1dLBYAnduK1MFH7zYb8KlTVrzR6SGxYEc=; b=EahSurK6ZIhaoDOEpKNTzydSsOlyFWUuXVHbeTCG6u9jYn807WfbT7mTZRe1oVAwrk PJlMePhsbOxjaDkvhKgoMZTfBBx4tpB1NCuxPXgCUB5o/C4s4JLaRa2bVzBNGut0DC75 nazt2L7hN9RxufyC+Co8dZAi+LiRQ+0WO6uqiAPYq8vMHs255Oz0m6OGdjoIlzS7D+ZC 2mYhFJkPmFqQlThHQ3DjFfne7D9yFfZmYFjAcj7gk+Cd471NMnMyybuLRwmpKisFCwPY mhUcZeJUN3bBCQH/G+saUUMz+7j7tAO/Xmqy7Veqf608Nb0eP3isbQT4Vgy6yH3M+lIF HpiQ== X-Received: by 10.66.159.42 with SMTP id wz10mr36699799pab.8.1421581524912; Sun, 18 Jan 2015 03:45:24 -0800 (PST) Received: from localhost (203-96-144-34.cable.paradise.net.nz. [203.96.144.34]) by mx.google.com with ESMTPSA id j8sm8819705pdo.79.2015.01.18.03.45.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Jan 2015 03:45:23 -0800 (PST) Date: Mon, 19 Jan 2015 00:45:18 +1300 From: hanno To: openwrt-devel@lists.openwrt.org Message-ID: <20150118114518.GA6650@hanno-All-Series> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [OpenWrt-Devel] [Patch] [packages] new package dansguardian X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Moved new version 2.12.03 from oldpackages to packages as request by Felix Fietkau Signed-off-by: Hanno Schupp diff -uprN ../trunk/feeds/packages/net/dansguardian/Makefile ./feeds/packages/net/dansguardian/Makefile --- ../trunk/feeds/packages/net/dansguardian/Makefile 1970-01-01 12:00:00.000000000 +1200 +++ ./feeds/packages/net/dansguardian/Makefile 2015-01-06 15:56:14.017306000 +1300 @@ -0,0 +1,62 @@ +# +# Copyright (C) 2008-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dansguardian +PKG_VERSION:=2.12.0.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://sourceforge.net/projects/dansguardian/files/ +PKG_MD5SUM:=2a88d0392cd28eaec02b7ee727b2e253 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/uclibc++.mk +include $(INCLUDE_DIR)/package.mk + +define Package/dansguardian + SECTION:=net + DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + TITLE:=DansGuardian + URL:=http://dansguardian.org +endef + +define Package/dansguardian/conffiles +/etc/dansguardian/dansguardian.conf +endef + +CONFIGURE_VARS += \ + INCLUDES="" \ + CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \ + LIBS="-lpthread" \ + +define Build/Configure + $(call Build/Configure/Default,\ + --disable-clamav \ + --with-sysconfsubdir=dansguardian \ + --with-proxyuser=root \ + --with-proxygroup=root \ + --disable-pcre \ + ) +endef + +define Package/dansguardian/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(CP) $(PKG_INSTALL_DIR)/etc/dansguardian $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/share/dansguardian + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(1)/usr/share/dansguardian/ + $(INSTALL_DIR) $(1)/usr/share/dansguardian/languages/ukenglish + $(CP) $(PKG_INSTALL_DIR)/usr/share/dansguardian/languages/ukenglish/* $(1)/usr/share/dansguardian/languages/ukenglish/ +endef + +$(eval $(call BuildPackage,dansguardian)) diff -uprN ../trunk/feeds/packages/net/dansguardian/patches/001-include_dir.patch ./feeds/packages/net/dansguardian/patches/001-include_dir.patch --- ../trunk/feeds/packages/net/dansguardian/patches/001-include_dir.patch 1970-01-01 12:00:00.000000000 +1200 +++ ./feeds/packages/net/dansguardian/patches/001-include_dir.patch 2015-01-06 08:08:58.494773000 +1300 @@ -0,0 +1,29 @@ +--- a/configure ++++ b/configure +@@ -861,7 +861,7 @@ sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + includedir='${prefix}/include' +-oldincludedir='/usr/include' ++oldincludedir='${prefix}/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' + infodir='${datarootdir}/info' + htmldir='${docdir}' +@@ -6317,7 +6317,7 @@ $as_echo_n "checking for zlib... " >&6; + # Check whether --with-zlib was given. + if test "${with_zlib+set}" = set; then + withval=$with_zlib; # check for header & func (in library) in given prefix +- CPPFLAGS="${CPPFLAGS} -I${withval}/include" ++ CPPFLAGS="${CPPFLAGS}" + if test "x$staticzlib" = "xtrue"; then + LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}" + else +@@ -10042,7 +10042,7 @@ _ACEOF + if test "${with_libiconv+set}" = set; then + withval=$with_libiconv; # check for header & func (in library) in given prefix + if test "x$withval" != "x"; then +- CPPFLAGS="${CPPFLAGS} -I${withval}/include" ++ CPPFLAGS="${CPPFLAGS}" + LIBS="-L${withval}/lib -liconv ${LIBS}" + else + LIBS="-liconv ${LIBS}"