[packages] quagga: Update to v0.99.18

[openwrt/svn-archive/archive.git] / net / quagga / Makefile

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 27dbd62226b9b69c268dd656dd6c97342869742a..4828959a8f41f9ce5a36f7556c32105fa5b009fe 100644 (file)
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=quagga
 ifneq ($(CONFIG_QUAGGA_OLD),)
   PKG_VERSION:=0.98.6
-  PKG_RELEASE:=8
+  PKG_RELEASE:=9
   PKG_MD5SUM:=b0d4132039953a0214256873b7d23d68
   PATCH_DIR:=./patches-old
 else
-  PKG_VERSION:=0.99.17
-  PKG_RELEASE:=5
-  PKG_MD5SUM:=37b9022adca04b03863d2d79787e643f
+  PKG_VERSION:=0.99.18
+  PKG_RELEASE:=1
+  PKG_MD5SUM:=59e306e93a4a1ce16760f20e9075d473
 endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -43,7 +43,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/quagga/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=quagga +libpthread
+  DEPENDS:=quagga
   TITLE:=The Quagga Software Routing Suite
   URL:=http://www.quagga.net
   MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
@@ -160,15 +160,13 @@ CONFIG_PACKAGE_quagga-ripngd:=m
 CONFIG_PACKAGE_quagga-vtysh:=m
 endif
 
-TARGET_LDFLAGS += -lpthread
-
 CONFIGURE_ARGS+= \
        --localstatedir=/var/run/quagga \
        --sysconfdir=/etc/quagga/ \
        --enable-shared \
        --disable-static \
-       --enable-user=quagga \
-       --enable-group=quagga \
+       --enable-user=network \
+       --enable-group=network \
        --enable-pie=no \
        --enable-multipath=8 \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-libzebra,zebra) \
@@ -181,7 +179,7 @@ CONFIGURE_ARGS+= \
        $(call autoconf_bool,CONFIG_PACKAGE_quagga-vtysh,vtysh) \
 
 MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -std=gnu99"
+       CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
@@ -203,54 +201,6 @@ define Package/quagga/install
        $(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
 endef
 
-define Package/quagga/postinst
-#!/bin/sh
-
-name=quagga
-id=51
-
-# do not change below
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-       # create copies of passwd and group, if we use squashfs
-       rootfs=`mount |awk '/root/ { print $$5 }'`
-       if [ "$$rootfs" = "squashfs" ]; then
-               if [ -h /etc/group ]; then
-                       rm /etc/group
-                       cp /rom/etc/group /etc/group
-               fi
-               if [ -h /etc/passwd ]; then
-                       rm /etc/passwd
-                       cp /rom/etc/passwd /etc/passwd
-               fi
-       fi
-fi
-
-echo ""
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then
-       echo "adding group $$name to /etc/group"
-       echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group
-fi
-
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then
-       echo "adding user $$name to /etc/passwd"
-       echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd
-fi
-
-grep -q '^zebra[[:space:]]*2601/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
-if [ $$? -ne 0 ]; then
-echo "zebrasrv      2600/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "zebra         2601/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "ripd          2602/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "ripngd        2603/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "ospfd         2604/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "bgpd          2605/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "ospf6d        2606/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "ospfapi       2607/tcp" >>$${IPKG_INSTROOT}/etc/services
-echo "isisd         2608/tcp" >>$${IPKG_INSTROOT}/etc/services
-fi
-endef
-
 define Package/quagga-bgpd/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/