rpms/tuxcmd/devel tuxcmd-fpc_2.2.2-2.2.0_compat.patch, NONE, 1.1 tuxcmd-fpc_2.2.2_compat.patch, NONE, 1.1 tuxcmd-selinux.patch, NONE, 1.1 tuxcmd-smartlinking.patch, NONE, 1.1 tuxcmd.spec, 1.4, 1.5
Tomas Bzatek
tbzatek at fedoraproject.org
Mon Aug 25 10:14:33 UTC 2008
Author: tbzatek
Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25642
Modified Files:
tuxcmd.spec
Added Files:
tuxcmd-fpc_2.2.2-2.2.0_compat.patch
tuxcmd-fpc_2.2.2_compat.patch tuxcmd-selinux.patch
tuxcmd-smartlinking.patch
Log Message:
* Mon Aug 25 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-4
- Rebuild against FPC 2.2.2 (fixes threading issues)
- Do not generate executable stack (fixes SELinux issues)
tuxcmd-fpc_2.2.2-2.2.0_compat.patch:
--- NEW FILE tuxcmd-fpc_2.2.2-2.2.0_compat.patch ---
From: Tomas Bzatek <tbzatek at users.sourceforge.net>
Date: Thu, 21 Aug 2008 15:53:01 +0000 (+0200)
Subject: FPC Compatibility fixes
X-Git-Tag: v0.6.46~1
X-Git-Url: http://git.bzatek.net/?p=tuxcmd%2F.git;a=commitdiff_plain;h=4c57ea157b3ee4b9d9b9716c27a538540b73fcd9
FPC Compatibility fixes
---
diff --git a/libgtk_kylix/GTKStdCtrls.pas b/libgtk_kylix/GTKStdCtrls.pas
index f2a2ec2..1cccdf8 100644
--- a/libgtk_kylix/GTKStdCtrls.pas
+++ b/libgtk_kylix/GTKStdCtrls.pas
@@ -420,10 +420,12 @@ begin
gtk_misc_set_padding(PGtkMisc(FWidget), XPadding, YPadding);
end;
+procedure x_gtk_misc_get_padding(misc:PGtkMisc; xpad:Pgint; ypad:Pgint); cdecl; external gtklib name 'gtk_misc_get_padding';
+
function TGTKMisc.GetXPadding: integer;
var xpad, ypad: gint;
begin
- gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
+ x_gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
Result := xpad;
end;
@@ -435,7 +437,7 @@ end;
function TGTKMisc.GetYPadding: integer;
var xpad, ypad: gint;
begin
- gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
+ x_gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
Result := ypad;
end;
tuxcmd-fpc_2.2.2_compat.patch:
--- NEW FILE tuxcmd-fpc_2.2.2_compat.patch ---
From: Tomas Bzatek <tbzatek at vmrawhide.w2k3dom>
Date: Wed, 20 Aug 2008 12:11:05 +0000 (+0200)
Subject: FPC 2.2.2 compatibility
X-Git-Tag: v0.6.46~4
X-Git-Url: http://git.bzatek.net/?p=tuxcmd%2F.git;a=commitdiff_plain;h=9e95d1204b9a05638e912d98ea3d1abf5faa35fd
FPC 2.2.2 compatibility
---
diff --git a/libgtk_kylix/GTKStdCtrls.pas b/libgtk_kylix/GTKStdCtrls.pas
index 1d4157a..f2a2ec2 100644
--- a/libgtk_kylix/GTKStdCtrls.pas
+++ b/libgtk_kylix/GTKStdCtrls.pas
@@ -421,11 +421,10 @@ begin
end;
function TGTKMisc.GetXPadding: integer;
-var xpad, ypad: pgint;
+var xpad, ypad: gint;
begin
- gtk_misc_get_padding(PGtkMisc(FWidget), xpad, ypad);
- if Assigned(xpad) then Result := Integer(xpad)
- else Result := 0;
+ gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
+ Result := xpad;
end;
procedure TGTKMisc.SetXPadding(Value: integer);
@@ -434,11 +433,10 @@ begin
end;
function TGTKMisc.GetYPadding: integer;
-var xpad, ypad: pgint;
+var xpad, ypad: gint;
begin
- gtk_misc_get_padding(PGtkMisc(FWidget), xpad, ypad);
- if Assigned(ypad) then Result := Integer(ypad)
- else Result := 0;
+ gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad);
+ Result := ypad;
end;
procedure TGTKMisc.SetYPadding(Value: integer);
tuxcmd-selinux.patch:
--- NEW FILE tuxcmd-selinux.patch ---
From: Tomas Bzatek <tbzatek at users.sourceforge.net>
Date: Thu, 21 Aug 2008 15:45:38 +0000 (+0200)
Subject: Mark stack as not executable, fixes SELinux issues
X-Git-Tag: v0.6.46~2
X-Git-Url: http://git.bzatek.net/?p=tuxcmd%2F.git;a=commitdiff_plain;h=f3f664b6dd8181c079a7c495390063336396532e
Mark stack as not executable, fixes SELinux issues
http://bugs.freepascal.org/view.php?id=11563
---
diff --git a/Makefile b/Makefile
index 439665b..5b5ca89 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ LIB_SUFFIX=`if test \`uname -m\` = x86_64; then echo 64; fi`
# -CR and -Cr must be disabled here, causes range check errors with gnome-power-manager
# -Cg generates internal compiler errors on i386
# -XX prevents linking errors of unresolved and unused symbols
-CFLAGS= -vweh -Un -Ci -Co -XX
+# "-k-z noexecstack" (with quotes as a single parameter) avoids marking stack as executable, allowing to work correctly with SELinux in Enforcing mode
+CFLAGS= -vweh -Un -Ci -Co -XX "-k-z noexecstack"
tuxcmd-smartlinking.patch:
--- NEW FILE tuxcmd-smartlinking.patch ---
From: Tomas Bzatek <tbzatek at vmrawhide.w2k3dom>
Date: Wed, 20 Aug 2008 12:25:46 +0000 (+0200)
Subject: Always use smartlinking to prevent unresolved symbols messages
X-Git-Tag: v0.6.46~3
X-Git-Url: http://git.bzatek.net/?p=tuxcmd%2F.git;a=commitdiff_plain;h=4ca87806591ddb110edccd91e7b581c40a1beb72
Always use smartlinking to prevent unresolved symbols messages
---
diff --git a/Makefile b/Makefile
index cd72bc1..439665b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,8 @@ LIB_SUFFIX=`if test \`uname -m\` = x86_64; then echo 64; fi`
# -Ct must be disabled here, causes unneeded crashes
# -CR and -Cr must be disabled here, causes range check errors with gnome-power-manager
# -Cg generates internal compiler errors on i386
-CFLAGS= -vweh -Un -Ci -Co
+# -XX prevents linking errors of unresolved and unused symbols
+CFLAGS= -vweh -Un -Ci -Co -XX
Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tuxcmd.spec 9 Jun 2008 11:09:35 -0000 1.4
+++ tuxcmd.spec 25 Aug 2008 10:14:03 -0000 1.5
@@ -1,6 +1,6 @@
Name: tuxcmd
Version: 0.6.36
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tux Commander: file manager with 2 panels side by side using GTK2
Group: Applications/File
@@ -16,11 +16,15 @@
Source3: tuxcmd.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fpc
+BuildRequires: fpc >= 2.2.2
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
Patch1: tuxcmd-modules-ziparchive-gcc43.patch
+Patch2: tuxcmd-fpc_2.2.2_compat.patch
+Patch3: tuxcmd-fpc_2.2.2-2.2.0_compat.patch
+Patch4: tuxcmd-smartlinking.patch
+Patch5: tuxcmd-selinux.patch
%description
@@ -59,6 +63,12 @@
%prep
%setup -b 1 -q
+
+%patch2 -p1 -b .fpc-compat-1
+%patch3 -p1 -b .fpc-compat-2
+%patch4 -p1 -b .smartlink
+%patch5 -p1 -b .execstack
+
cd ../%{name}-modules-%{version}
%patch1 -p1 -b .gcc43
@@ -118,6 +128,10 @@
%changelog
+* Mon Aug 25 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-4
+- Rebuild against FPC 2.2.2 (fixes threading issues)
+- Do not generate executable stack (fixes SELinux issues)
+
* Mon Jun 9 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-3
- Add ZIP module
More information about the fedora-extras-commits
mailing list