X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=admin%2Fosiris%2FMakefile;h=51ad2431a6fcb0f85a688e75d672805372a3bb99;hp=24520d838bffdebda780ad907f19988fee7e9bc9;hb=89fc9dac38e936893178cccd8c1a6b99c66f685d;hpb=52032d0f8733a4baf2b61aea21a92e66b311c7a5

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index 24520d838b..51ad2431a6 100644
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@@ -9,16 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=osiris
-PKG_VERSION:=4.2.1
+PKG_VERSION:=4.2.3
 PKG_RELEASE:=1
 
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://osiris.shmoo.com/data/
-PKG_MD5SUM:=11445f7d8dec737f0be89357f5c5bcae
+PKG_MD5SUM:=1951c7dc0fe729af9ffaf58910340d12
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,37 +27,31 @@ define Package/osirisd
   CATEGORY:=Administration
   DEPENDS:=+libopenssl
   TITLE:=Host integrity monitoring system (scanning agent)
-  DESCRIPTION:=an Host Integrity Monitoring System (scanning agent)
   URL:=http://www.hostintegrity.com/osiris
 endef
 
 define Build/Configure
-  $(call Build/Configure/Default, \
-	--with-osiris-user=root \
-	--with-root-dir=/var/lib/osiris \
-	--with-readline=no, \
-	ac_cv_openssldir="$(STAGING_DIR)/usr" \
-	ac_cv_have_accrights_in_msghdr=no \
-	ac_cv_have_control_in_msghdr=yes \
-  )
+	$(call Build/Configure/Default, \
+		--with-osiris-user=root \
+		--with-root-dir=/var/lib/osiris \
+		--with-readline=no, \
+		ac_cv_openssldir="$(STAGING_DIR)/usr" \
+	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		ar=$(TARGET_CROSS)ar \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INTERACTIVE=0 \
 		all install
 endef
 
 define Package/osirisd/install	
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/osirisd.init $(1)/etc/init.d/osirisd
-	install -d -m0755 $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd
 endef
 
 $(eval $(call BuildPackage,osirisd))