* Tue Nov 28 2006 Dan Walsh <dwalsh@redhat.com> 1.33.5-1
- Merge to upstream - Fix makefile line Resolves: #208838
This commit is contained in:
parent
7fe1af0250
commit
8ce11d75ff
@ -118,3 +118,4 @@ policycoreutils-1.32.tgz
|
|||||||
policycoreutils-1.33.1.tgz
|
policycoreutils-1.33.1.tgz
|
||||||
policycoreutils-1.33.2.tgz
|
policycoreutils-1.33.2.tgz
|
||||||
policycoreutils-1.33.4.tgz
|
policycoreutils-1.33.4.tgz
|
||||||
|
policycoreutils-1.33.5.tgz
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1681,8 +1681,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic
|
|||||||
+
|
+
|
||||||
diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.4/gui/system-config-selinux.glade
|
diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.4/gui/system-config-selinux.glade
|
||||||
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-1.33.4/gui/system-config-selinux.glade 2006-11-22 14:11:25.000000000 -0500
|
+++ policycoreutils-1.33.4/gui/system-config-selinux.glade 2006-11-24 17:16:19.000000000 -0500
|
||||||
@@ -0,0 +1,2792 @@
|
@@ -0,0 +1,2803 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
+
|
+
|
||||||
@ -3487,16 +3487,27 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic
|
|||||||
+ </child>
|
+ </child>
|
||||||
+
|
+
|
||||||
+ <child>
|
+ <child>
|
||||||
+ <widget class="GtkTreeView" id="booleansView">
|
+ <widget class="GtkScrolledWindow" id="scrolledwindow18">
|
||||||
+ <property name="visible">True</property>
|
+ <property name="visible">True</property>
|
||||||
+ <property name="can_focus">True</property>
|
+ <property name="can_focus">True</property>
|
||||||
+ <property name="headers_visible">False</property>
|
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||||
+ <property name="rules_hint">False</property>
|
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||||
+ <property name="reorderable">False</property>
|
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||||
+ <property name="enable_search">True</property>
|
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||||
+ <property name="fixed_height_mode">False</property>
|
+
|
||||||
+ <property name="hover_selection">False</property>
|
+ <child>
|
||||||
+ <property name="hover_expand">False</property>
|
+ <widget class="GtkTreeView" id="booleansView">
|
||||||
|
+ <property name="visible">True</property>
|
||||||
|
+ <property name="can_focus">True</property>
|
||||||
|
+ <property name="headers_visible">False</property>
|
||||||
|
+ <property name="rules_hint">False</property>
|
||||||
|
+ <property name="reorderable">False</property>
|
||||||
|
+ <property name="enable_search">True</property>
|
||||||
|
+ <property name="fixed_height_mode">False</property>
|
||||||
|
+ <property name="hover_selection">False</property>
|
||||||
|
+ <property name="hover_expand">False</property>
|
||||||
|
+ </widget>
|
||||||
|
+ </child>
|
||||||
+ </widget>
|
+ </widget>
|
||||||
+ <packing>
|
+ <packing>
|
||||||
+ <property name="tab_expand">False</property>
|
+ <property name="tab_expand">False</property>
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
%define libselinuxver 1.30.29-2
|
%define libselinuxver 1.30.29-2
|
||||||
Summary: SELinux policy core utilities.
|
Summary: SELinux policy core utilities.
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 1.33.4
|
Version: 1.33.5
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
@ -45,7 +45,7 @@ context.
|
|||||||
%patch1 -p1 -b .rhatpo
|
%patch1 -p1 -b .rhatpo
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
|
make AUDIT_LOG_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
@ -58,7 +58,7 @@ mkdir -p %{buildroot}%{_mandir}/man8
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
|
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
|
mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
|
||||||
|
|
||||||
make LOG_AUDIT_PRIV=y DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
|
make AUDIT_LOG_PRIV=y DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
|
||||||
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/system-config-selinux/
|
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/system-config-selinux/
|
||||||
install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
|
install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
|
||||||
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
|
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
|
||||||
@ -168,6 +168,11 @@ fi
|
|||||||
[ -x /sbin/service ] && /sbin/service restorecond condrestart
|
[ -x /sbin/service ] && /sbin/service restorecond condrestart
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 28 2006 Dan Walsh <dwalsh@redhat.com> 1.33.5-1
|
||||||
|
- Merge to upstream
|
||||||
|
- Fix makefile line
|
||||||
|
Resolves: #208838
|
||||||
|
|
||||||
* Fri Nov 24 2006 Dan Walsh <dwalsh@redhat.com> 1.33.4-2
|
* Fri Nov 24 2006 Dan Walsh <dwalsh@redhat.com> 1.33.4-2
|
||||||
- Additional po changes
|
- Additional po changes
|
||||||
- Added all booleans definitions
|
- Added all booleans definitions
|
||||||
|
Loading…
Reference in New Issue
Block a user