rpms/WebKit/F-8 .cvsignore, 1.3, 1.4 WebKit.spec, 1.2, 1.3 sources, 1.3, 1.4
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Sun Apr 13 07:33:51 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/WebKit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11244/WebKit/F-8
Modified Files:
.cvsignore WebKit.spec sources
Log Message:
version bump for security fix (CVE-2008-1010 and CVE-2008-1011)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Mar 2008 03:12:54 -0000 1.3
+++ .cvsignore 13 Apr 2008 07:33:11 -0000 1.4
@@ -1 +1 @@
-WebKit-r30667.tar.bz2
+WebKit-r31787.tar.bz2
Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-8/WebKit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebKit.spec 5 Mar 2008 03:12:54 -0000 1.2
+++ WebKit.spec 13 Apr 2008 07:33:11 -0000 1.3
@@ -3,11 +3,11 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
-%define svn_revision 30667
+%define svn_revision 31787
Name: WebKit
Version: 1.0.0
-Release: 0.6.svn%{svn_revision}%{?dist}
+Release: 0.8.svn%{svn_revision}%{?dist}
Summary: Web content engine library
Group: Development/Libraries
@@ -23,8 +23,11 @@
BuildRequires: flex
BuildRequires: gperf
BuildRequires: gtk2-devel
-BuildRequires: libicu-devel
+BuildRequires: libicu-devel
+BuildRequires: libtool
BuildRequires: libxslt-devel
+BuildRequires: pango-devel
+BuildRequires: pcre-devel
## Necessary for qmake and friends.
BuildRequires: qt4-devel
BuildRequires: sqlite-devel
@@ -94,6 +97,7 @@
%prep
%setup -qn "%{name}-r%{svn_revision}"
+
%build
## We don't like pre-built binaries, especially ones for other OSes. =)
rm -r WebKitLibraries/{*.a,win/}
@@ -102,20 +106,11 @@
chmod a-x WebCore/dom/Clipboard.cpp
## Build the GTK+ port...
-install -d build-gtk
+mkdir build-gtk
+cp -a $(echo * | sed -e 's/build-gtk //') build-gtk
pushd build-gtk
- %{_qt4_qmake} -r \
- OUTPUT_DIR="$PWD" \
- QMAKE_STRIP=/bin/true \
- QMAKE_RPATH= \
- QMAKE_CFLAGS="%{optflags}" \
- QMAKE_CXXFLAGS="%{optflags}" \
- VERSION=%{version} \
- CONFIG-=qt \
- CONFIG+=gtk-port \
- WEBKIT_INC_DIR=%{_includedir}/webkit \
- WEBKIT_LIB_DIR=%{_libdir} \
- ../WebKit.pro
+ ./autogen.sh
+ %configure --with-font-backend=pango --enable-icon-database
make %{?_smp_mflags}
popd
@@ -141,9 +136,11 @@
%install
rm -rf %{buildroot}
-make -C build-gtk install INSTALL_ROOT=%{buildroot}
+make -C build-gtk install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 755 build-gtk/WebKitTools/GtkLauncher/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+install -m 755 build-gtk/Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+
+
make -C build-qt install INSTALL_ROOT=%{buildroot}
install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name}
@@ -152,7 +149,7 @@
## Cleanup the pkgconfig files a bit...
pushd %{buildroot}%{_libdir}/pkgconfig/
- for WEBKIT_LIB in QtWebKit WebKitGtk; do
+ for WEBKIT_LIB in QtWebKit; do
sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc
## We don't need linkage that the WebKit DSOs already ensure.
sed -i -e "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc
@@ -195,18 +192,16 @@
%files gtk
%defattr(-,root,root,-)
%doc
-%{_libdir}/libWebKitGtk.so.*
+%{_libdir}/libwebkit-1.0.so.*
%dir %{_libexecdir}/WebKit/
%{_libexecdir}/WebKit/GtkLauncher
%files gtk-devel
%defattr(-,root,root,-)
-## The .prl file stores information only on how the library was built, and is
-## not needed for linking.
-%exclude %{_libdir}/libWebKitGtk.prl
-%{_includedir}/webkit
-%{_libdir}/libWebKitGtk.so
-%{_libdir}/pkgconfig/WebKitGtk.pc
+%exclude %{_libdir}/*.la
+%{_includedir}/webkit-1.0
+%{_libdir}/libwebkit-1.0.so
+%{_libdir}/pkgconfig/webkit-1.0.pc
%files qt
%defattr(-,root,root,-)
@@ -229,6 +224,17 @@
%changelog
+* Sat Apr 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.8.svn31787
+- Update to new upstream snapshot (SVN 31787).
+- Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and
+ CVE-2008-1011 (bug 438531: Cross-Site Scripting).
+- Switch to using autotools for building the GTK+ port.
+
+* Wed Mar 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.7.svn30667
+- Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves
+ bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc).
+- Thanks to Mamoru Tasaka for helping find and squash these many bugs.
+
* Sat Mar 01 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.6.svn30667
- Fix include directory naming. Resolves: bug 435561 (Header file <> header
file location mismatch)
@@ -256,4 +262,4 @@
- Add various AUTHORS, README, and LICENSE files (via the doc subpackage).
* Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
-- Initial packaging for Fedora.
\ No newline at end of file
+- Initial packaging for Fedora.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Mar 2008 03:12:54 -0000 1.3
+++ sources 13 Apr 2008 07:33:11 -0000 1.4
@@ -1 +1 @@
-d5047727add37bdbba6a4642b0a9c0f4 WebKit-r30667.tar.bz2
+786a8fc7c9fd8755c8c75e93ae4b7bc2 WebKit-r31787.tar.bz2
More information about the fedora-extras-commits
mailing list