From 48351a39e07e950a3800afd3e9ca65af85b0a82f Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 17 Oct 2012 13:00:44 +0000
Subject: [PATCH] sysfsutils, libnfnetlink: move to trunk, add myself as
 maintainer

SVN-Revision: 33806
---
 libs/libnfnetlink/Makefile                    | 69 -------------------
 {libs => utils}/sysfsutils/Makefile           |  3 +-
 .../patches/200-mnt_path_check.patch          |  0
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 libs/libnfnetlink/Makefile
 rename {libs => utils}/sysfsutils/Makefile (94%)
 rename {libs => utils}/sysfsutils/patches/200-mnt_path_check.patch (100%)

diff --git a/libs/libnfnetlink/Makefile b/libs/libnfnetlink/Makefile
deleted file mode 100644
index 44409fa0bc..0000000000
--- a/libs/libnfnetlink/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2007-2010 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:=libnfnetlink
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-	http://www.netfilter.org/projects/libnfnetlink/files/ \
-	ftp://ftp.netfilter.org/pub/libnfnetlink/ \
-	http://mirrors.evolva.ro/netfilter.org/libnfnetlink/
-PKG_MD5SUM:=016fdec8389242615024c529acc1adb8
-
-PKG_FIXUP:=autoreconf
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libnfnetlink
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A low-level library for netfilter related kernel/userspace communication
-  URL:=http://netfilter.org/projects/libnfnetlink/
-endef
-
-define Package/libnfnetlink/description
- libnfnetlink is is the low-level library for netfilter related kernel/userspace communication.
- It provides a generic messaging infrastructure for in-kernel netfilter subsystems
- (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
- and/or management tools in userspace.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-static \
-	--enable-shared
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libnfnetlink
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h \
-		$(1)/usr/include/libnfnetlink/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfnetlink.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libnfnetlink/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libnfnetlink))
diff --git a/libs/sysfsutils/Makefile b/utils/sysfsutils/Makefile
similarity index 94%
rename from libs/sysfsutils/Makefile
rename to utils/sysfsutils/Makefile
index aa6499ef4e..3c43bbc16a 100644
--- a/libs/sysfsutils/Makefile
+++ b/utils/sysfsutils/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -14,6 +14,7 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-diag
 PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 
 PKG_FIXUP:=autoreconf
 
diff --git a/libs/sysfsutils/patches/200-mnt_path_check.patch b/utils/sysfsutils/patches/200-mnt_path_check.patch
similarity index 100%
rename from libs/sysfsutils/patches/200-mnt_path_check.patch
rename to utils/sysfsutils/patches/200-mnt_path_check.patch
-- 
2.30.2