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/osiris | |
| 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/osiris')
| -rw-r--r-- | package/osiris/Makefile | 11 | ||||
| -rw-r--r-- | package/osiris/files/osirisd.init | 4 | ||||
| -rw-r--r-- | package/osiris/files/osirisd.postinst (renamed from package/osiris/ipkg/osirisd.postinst) | 0 | ||||
| -rw-r--r-- | package/osiris/ipkg/osirisd.control | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/package/osiris/Makefile b/package/osiris/Makefile index 62a372ad3..e7d8504e9 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= osiris PKG_VERSION:= 4.2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 1951c7dc0fe729af9ffaf58910340d12 -MASTER_SITES:= http://osiris.shmoo.com/data/ +PKG_DESCR:= Host Integrity Monitoring System (scanning agent) +PKG_SECTION:= admin +PKG_DEPENDS:= libopenssl libpthread +PKG_URL:= http://osiris.shmoo.com +PKG_SITES:= http://osiris.shmoo.com/data/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OSIRISD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_DIR}/usr" \ @@ -32,10 +36,7 @@ post-configure: (cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh); post-install: - ${INSTALL_DIR} ${IDIR_OSIRISD}/etc/init.d ${INSTALL_DIR} ${IDIR_OSIRISD}/usr/sbin - ${INSTALL_BIN} ./files/osirisd.init \ - ${IDIR_OSIRISD}/etc/init.d/osirisd ${INSTALL_BIN} ${WRKINST}/usr/sbin/osirisd \ ${IDIR_OSIRISD}/usr/sbin/ diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init index 4172f702a..6d6b4d443 100644 --- a/package/osiris/files/osirisd.init +++ b/package/osiris/files/osirisd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 75 +#PKG osirisd +#INIT 75 + . /etc/rc.conf case $1 in diff --git a/package/osiris/ipkg/osirisd.postinst b/package/osiris/files/osirisd.postinst index 04e53ac93..04e53ac93 100644 --- a/package/osiris/ipkg/osirisd.postinst +++ b/package/osiris/files/osirisd.postinst diff --git a/package/osiris/ipkg/osirisd.control b/package/osiris/ipkg/osirisd.control deleted file mode 100644 index defe7c356..000000000 --- a/package/osiris/ipkg/osirisd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: osirisd -Priority: optional -Section: admin -Depends: libopenssl, libpthread -Description: an Host Integrity Monitoring System (scanning agent) |