diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libnids | |
parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libnids')
-rw-r--r-- | package/libnids/Makefile | 6 | ||||
-rw-r--r-- | package/libnids/ipkg/libnids.control | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 99aa71231..e5e869a83 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libnids PKG_VERSION:= 1.18 PKG_RELEASE:= 1 PKG_MD5SUM:= 9ee6dcdfac97bae6fe611aa27d2594a5 -MASTER_SITES:= http://www.packetfactory.net/projects/libnids/dist/ +PKG_DESCR:= implementation of an E-component of Network Intrusion Detection System +PKG_SECTION:= libs +PKG_SITES:= http://www.packetfactory.net/projects/libnids/dist/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \ diff --git a/package/libnids/ipkg/libnids.control b/package/libnids/ipkg/libnids.control deleted file mode 100644 index f34274269..000000000 --- a/package/libnids/ipkg/libnids.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libnids -Priority: optional -Section: libs -Description: implementation of an E-component of Network Intrusion Detection System. -Depends: libpcap, libnet |