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/portsentry | |
| 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/portsentry')
| -rw-r--r-- | package/portsentry/Makefile | 10 | ||||
| -rw-r--r-- | package/portsentry/files/portsentry.conffiles (renamed from package/portsentry/ipkg/portsentry.conffiles) | 0 | ||||
| -rw-r--r-- | package/portsentry/ipkg/portsentry.control | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 71707ba3c..459298b3f 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -9,21 +9,23 @@ PKG_NAME:= portsentry PKG_VERSION:= 1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 3ebd3618ba9abfea2525e236bd44cebd -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=sentrytools/} +PKG_DESCR:= Software for protection against port scans +PKG_SECTION:= net +PKG_URL:= http://sourceforge.net/projects/sentrytools +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sentrytools/} WRKDIST= ${WRKDIR}/${PKG_NAME}_beta include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PORTSENTRY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto ALL_TARGET:= linux MAKE_FLAGS+= CC="${TARGET_CC}" CFLAGS="${TCFLAGS}" do-install: - ${INSTALL_DIR} ${IDIR_PORTSENTRY}/usr/bin \ - ${IDIR_PORTSENTRY}/etc + ${INSTALL_DIR} ${IDIR_PORTSENTRY}/usr/bin ${IDIR_PORTSENTRY}/etc ${INSTALL_DATA} ${WRKBUILD}/${PKG_NAME}.conf ${IDIR_PORTSENTRY}/etc/ ${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_PORTSENTRY}/usr/bin/ diff --git a/package/portsentry/ipkg/portsentry.conffiles b/package/portsentry/files/portsentry.conffiles index 9c0810ccb..9c0810ccb 100644 --- a/package/portsentry/ipkg/portsentry.conffiles +++ b/package/portsentry/files/portsentry.conffiles diff --git a/package/portsentry/ipkg/portsentry.control b/package/portsentry/ipkg/portsentry.control deleted file mode 100644 index f05b282df..000000000 --- a/package/portsentry/ipkg/portsentry.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: portsentry -Priority: optional -Section: net -Description: Software for protection against port scans |