From 0bd8bf914b6c2c741e7c5af7f71fe74019c12c37 Mon Sep 17 00:00:00 2001 From: hannes Date: Wed, 8 Dec 2004 10:30:22 +0000 Subject: [PATCH] hannes: cleanup all the selinuxpackages [2004120201114408780] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5021 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/hannes/checkpolicy/checkpolicy.conf | 9 ++------- package/hannes/checkpolicy/checkpolicy.desc | 2 +- package/hannes/libselinux/libselinux.conf | 7 +------ package/hannes/libselinux/libselinux.desc | 3 ++- package/hannes/libsepol/libsepol.conf | 7 +------ package/hannes/libsepol/libsepol.desc | 2 +- package/hannes/policycoreutils/policycoreutils.desc | 2 +- 7 files changed, 9 insertions(+), 23 deletions(-) diff --git a/package/hannes/checkpolicy/checkpolicy.conf b/package/hannes/checkpolicy/checkpolicy.conf index 536b0911f..0c4765120 100644 --- a/package/hannes/checkpolicy/checkpolicy.conf +++ b/package/hannes/checkpolicy/checkpolicy.conf @@ -5,7 +5,7 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/hannes/libsepol/libsepol.conf +# ROCK Linux: rock-src/package/hannes/checkpolicy/checkpolicy.conf # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify @@ -20,9 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -checkpolicy_main() { - make DESTDIR=$root/ -} - -custmain="checkpolicy_main" +var_append makeinstopt ' ' "DESTDIR=$root/" diff --git a/package/hannes/checkpolicy/checkpolicy.desc b/package/hannes/checkpolicy/checkpolicy.desc index 0a89b9b52..01bb7908c 100644 --- a/package/hannes/checkpolicy/checkpolicy.desc +++ b/package/hannes/checkpolicy/checkpolicy.desc @@ -5,7 +5,7 @@ [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] -[COPY] ROCK Linux: rock-src/package/hannes/libsepol/libsepol.desc +[COPY] ROCK Linux: rock-src/package/hannes/checkpolicy/checkpolicy.desc [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify diff --git a/package/hannes/libselinux/libselinux.conf b/package/hannes/libselinux/libselinux.conf index d55eb6790..88c578d91 100644 --- a/package/hannes/libselinux/libselinux.conf +++ b/package/hannes/libselinux/libselinux.conf @@ -20,9 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -libselinux_main() { - make DESTDIR=$root/ -} - -custmain="libselinux_main" +var_append makeinstopt ' ' "DESTDIR=$root/" diff --git a/package/hannes/libselinux/libselinux.desc b/package/hannes/libselinux/libselinux.desc index 526105cf0..b89c461bf 100644 --- a/package/hannes/libselinux/libselinux.desc +++ b/package/hannes/libselinux/libselinux.desc @@ -22,7 +22,8 @@ [I] the main selinux library and some utilities -[T] This archive contains the libselinux library and simple utilities that use it. +[T] This archive contains the libselinux library and simple utilities that +[T] use it. [U] http://www.nsa.gov/selinux/ diff --git a/package/hannes/libsepol/libsepol.conf b/package/hannes/libsepol/libsepol.conf index 7f26b9962..4242c69d4 100644 --- a/package/hannes/libsepol/libsepol.conf +++ b/package/hannes/libsepol/libsepol.conf @@ -20,9 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -libsepol_main() { - make DESTDIR=$root/ -} - -custmain="libsepol_main" +var_append makeinstopt ' ' "DESTDIR=$root/" diff --git a/package/hannes/libsepol/libsepol.desc b/package/hannes/libsepol/libsepol.desc index 0929c557c..32ed0b985 100644 --- a/package/hannes/libsepol/libsepol.desc +++ b/package/hannes/libsepol/libsepol.desc @@ -26,7 +26,7 @@ [T] an interface for manipulating binary policies. The core [T] checkpolicy logic has been moved into this library so that [T] functions for manipulating binary policies can be exported -[T] to programs like load_policy. The archive also includes a spec file. +[T] to programs like load_policy. [U] http://www.nsa.gov/selinux/ diff --git a/package/hannes/policycoreutils/policycoreutils.desc b/package/hannes/policycoreutils/policycoreutils.desc index 06d9bd858..120c34fd3 100644 --- a/package/hannes/policycoreutils/policycoreutils.desc +++ b/package/hannes/policycoreutils/policycoreutils.desc @@ -39,6 +39,6 @@ [L] GPL [S] Stable [V] 1.18 -[P] O -?---5---9 500.200 +[P] O -?---5---9 500.300 [D] 3012243925 policycoreutils-1.18.tgz http://www.nsa.gov/selinux/archives/