rpms/eclipse/devel eclipse-ecj-gcj.patch, 1.8, 1.9 eclipse.spec, 1.457, 1.458
by fedora-extras-commits@redhat.com
Author: bkonrath
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18214
Modified Files:
eclipse-ecj-gcj.patch eclipse.spec
Log Message:
* Tue Jul 31 2007 Ben Konrath <bkonrath(a)redhat.com> 3.3.0-4
- Link to commons-el.jar.
- Remove ant 1.7 hacks.
eclipse-ecj-gcj.patch:
Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-ecj-gcj.patch 26 Jul 2007 22:18:47 -0000 1.8
+++ eclipse-ecj-gcj.patch 31 Jul 2007 23:02:58 -0000 1.9
@@ -367,7 +367,7 @@
+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ }
+ this.destinationPath = arg;
-+ this.generatePackagesStructure = true;
++ // this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- eclipse.spec 26 Jul 2007 22:21:06 -0000 1.457
+++ eclipse.spec 31 Jul 2007 23:02:58 -0000 1.458
@@ -557,12 +557,6 @@
assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
features/org.eclipse.rcp/build.xml
-# we don't have ant 1.7 right now
-sed --in-place "s|\(initialValue = request.getDefaultValue\)|// \1|" \
- plugins/org.eclipse.ant.ui/Ant\ Runner\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/AntInputHandler.java
-sed --in-place "s|\(value = fRequest.getDefaultValue\)|// \1|" \
- plugins/org.eclipse.ant.ui/Remote\ Ant\ Support/org/eclipse/ant/internal/ui/antsupport/inputhandler/SWTInputHandler.java
-
## Nasty hack to get suppport for ppc64, s390{,x}, sparc{,64} and alpha
%patch24 -p1
# there is only partial support for ppc64 so we have to remove this
@@ -618,6 +612,10 @@
rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
+# link to commons-el
+rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
+ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
+
# delete included jars
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
@@ -1072,6 +1070,10 @@
rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar
+# link to commons-el
+rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar
+ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar
+
popd
# Ensure that the zip files are the same across all builds.
@@ -1109,12 +1111,12 @@
# move the contents over to the a new directory in order and set the times.
for f in `find -type f | LC_ALL=C sort`; do
cp $f $ZIPDIR2/$f
- touch --date="1970-01-01 UTC" $ZIPDIR2/$f
+ touch --date="1980-01-01 UTC" $ZIPDIR2/$f
done
popd
# Set the times of the directories.
- touch --date="1970-01-01 UTC" `find $ZIPDIR2 -type d`
+ touch --date="1980-01-01 UTC" `find $ZIPDIR2 -type d`
# make the new zip
pushd $ZIPDIR2
@@ -1135,12 +1137,12 @@
# move the contents over to the a new directory in order and set the times.
for f in `find -type f | LC_ALL=C sort`; do
cp $f $ZIPDIR/$f
- touch --date="1970-01-01 UTC" $ZIPDIR/$f
+ touch --date="1980-01-01 UTC" $ZIPDIR/$f
done
popd
# Set the times of the directories.
- touch --date="1970-01-01 UTC" `find $ZIPDIR -type d`
+ touch --date="1980-01-01 UTC" `find $ZIPDIR -type d`
# make the new zip
pushd $ZIPDIR
@@ -1464,7 +1466,6 @@
%if %{gcj_support}
%{_libdir}/gcj/%{name}/javax.servlet_*
%{_libdir}/gcj/%{name}/javax.servlet.jsp_*
-%{_libdir}/gcj/%{name}/org.apache.commons.el_*
%{_libdir}/gcj/%{name}/org.apache.jasper_*
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
%{_libdir}/gcj/%{name}/org.eclipse.compare_*
@@ -1625,8 +1626,9 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
-* Thu Jul 26 2007 Ben Konrath <bkonrath(a)redhat.com> 3.3.0-4
-- Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch.
+* Tue Jul 31 2007 Ben Konrath <bkonrath(a)redhat.com> 3.3.0-4
+- Link to commons-el.jar.
+- Remove ant 1.7 hacks.
* Wed Jul 18 2007 Ben Konrath <bkonrath(a)redhat.com> 3.3.0-3
- Add links for lucene and lucene.analysis.
16 years, 1 month
rpms/libnet/devel libnet.spec,1.9,1.10
by fedora-extras-commits@redhat.com
Author: pertusus
Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10554
Modified Files:
libnet.spec
Log Message:
* Wed Aug 1 2007 Patrice Dumas <pertusus(a)free.fr> 1.1.2.1-11
- build with -fPIC (#250296)
Index: libnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libnet.spec 15 Jan 2007 23:49:53 -0000 1.9
+++ libnet.spec 31 Jul 2007 23:00:49 -0000 1.10
@@ -1,7 +1,7 @@
Summary: C library for portable packet creation and injection
Name: libnet
Version: 1.1.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://www.packetfactory.net/libnet/
@@ -24,6 +24,7 @@
Summary: Development files for libnet
Group: Development/Libraries
Provides: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
%description devel
Libnet is an API to help with the construction and handling of network packets.
@@ -40,33 +41,43 @@
%patch0 -p1 -b odd_chksum
sed -i -e 's/\r$//' doc/CHANGELOG doc/CONTRIB
find . -depth -type d -name CVS -exec rm -rf {} ';'
-rm -rf sample/win32
rm -f sample/.\#* sample/.*.swp
+
%build
-%configure
+# keep the sample directory untouched by make
+rm -rf __fedora_sample
+mkdir __fedora_sample
+cp -a sample __fedora_sample
+
+export CFLAGS="%{optflags} -fPIC"
+%configure --disable-dependency-tracking
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-
-install -D --mode=0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+make DESTDIR=%{buildroot} install INSTALL='install -c -p'
-install -d --mode=0755 %{buildroot}%{_mandir}/man3
-install -D --mode=0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
-
-make -C sample clean
+mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man3
+install -p -m0755 libnet-config %{buildroot}%{_bindir}/libnet-config
+install -p -m0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/
+
+# prepare samples directory
+rm -rf __fedora_sample/sample/win32
+rm __fedora_sample/sample/Makefile.in
+sed -i -e 's:#include "../include/libnet.h":#include <libnet.h>:' __fedora_sample/sample/libnet_test.h
%clean
rm -rf %{buildroot}
+
%files devel
%defattr(-,root,root,-)
%doc README VERSION
%doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES
%doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR
-%doc doc/TODO doc/html/ sample/
+%doc doc/TODO doc/html/ __fedora_sample/sample/
%{_bindir}/libnet-config
%{_includedir}/libnet/
@@ -74,7 +85,11 @@
%{_libdir}/libnet.a
%{_mandir}/man3/libnet*
+
%changelog
+* Wed Aug 1 2007 Patrice Dumas <pertusus(a)free.fr> 1.1.2.1-11
+- build with -fPIC (#250296)
+
* Fri Jan 12 2007 Patrice Dumas <pertusus(a)free.fr> 1.1.2.1-10
- add debian patch to correct bad checksums
16 years, 1 month
rpms/gtkmm24/devel .cvsignore, 1.16, 1.17 gtkmm.spec, 1.28, 1.29 sources, 1.18, 1.19
by fedora-extras-commits@redhat.com
Author: denis
Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9907
Modified Files:
.cvsignore gtkmm.spec sources
Log Message:
Update to 2.11.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 21 Jun 2007 15:18:41 -0000 1.16
+++ .cvsignore 31 Jul 2007 22:49:59 -0000 1.17
@@ -1 +1 @@
-gtkmm-2.11.3.tar.bz2
+gtkmm-2.11.6.tar.bz2
Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkmm.spec 2 Jul 2007 17:13:57 -0000 1.28
+++ gtkmm.spec 31 Jul 2007 22:49:59 -0000 1.29
@@ -1,6 +1,6 @@
Name: gtkmm24
-Version: 2.11.3
-Release: 2%{?dist}
+Version: 2.11.6
+Release: 1%{?dist}
Summary: C++ interface for GTK2 (a GUI library for X)
@@ -110,6 +110,9 @@
%changelog
+* Wed Aug 1 2007 Denis Leroy <denis(a)poolshark.org> - 2.11.6-1
+- Update to 2.11.6
+
* Tue Jul 3 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.11.3-2
- Rebuild against newest GLib (due to #245141, #245634)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 21 Jun 2007 15:18:41 -0000 1.18
+++ sources 31 Jul 2007 22:49:59 -0000 1.19
@@ -1 +1 @@
-cd460d42dce509f979ad220f66608453 gtkmm-2.11.3.tar.bz2
+ffddf21ec5f1ee9b15905ec06998c38f gtkmm-2.11.6.tar.bz2
16 years, 1 month
rpms/vips/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vips.spec, 1.7, 1.8
by fedora-extras-commits@redhat.com
Author: agoode
Update of /cvs/extras/rpms/vips/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9872
Modified Files:
.cvsignore sources vips.spec
Log Message:
new release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 25 Jul 2007 03:33:59 -0000 1.5
+++ .cvsignore 31 Jul 2007 22:49:09 -0000 1.6
@@ -1 +1 @@
-vips-7.12.2.tar.gz
+vips-7.12.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 25 Jul 2007 03:33:59 -0000 1.5
+++ sources 31 Jul 2007 22:49:09 -0000 1.6
@@ -1 +1 @@
-50862630a7deb9674544679c8ab491b4 vips-7.12.2.tar.gz
+5399e1355172964f503ce1422e648ffd vips-7.12.4.tar.gz
Index: vips.spec
===================================================================
RCS file: /cvs/extras/rpms/vips/devel/vips.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vips.spec 25 Jul 2007 03:33:59 -0000 1.7
+++ vips.spec 31 Jul 2007 22:49:09 -0000 1.8
@@ -1,7 +1,7 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: vips
-Version: 7.12.2
+Version: 7.12.4
Release: 1%{?dist}
Summary: Library for processing large images
16 years, 1 month
rpms/intltool/devel intltool-0.35.5-polkit.patch, NONE, 1.1 intltool.spec, 1.33, 1.34
by fedora-extras-commits@redhat.com
Author: davidz
Update of /cvs/pkgs/rpms/intltool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240
Modified Files:
intltool.spec
Added Files:
intltool-0.35.5-polkit.patch
Log Message:
* Tue Jul 31 2007 David Zeuthen <davidz(a)redhat.com> - 0.35.5-5
- Add support for PolicyKit .policy files (b.g.o #462312)
intltool-0.35.5-polkit.patch:
--- NEW FILE intltool-0.35.5-polkit.patch ---
diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
--- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400
+++ intltool-0.35.5/intltool.m4 2007-07-31 17:24:20.000000000 -0400
@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
--- intltool-0.35.5/intltool-update.in.in.polkit 2007-07-31 17:10:52.000000000 -0400
+++ intltool-0.35.5/intltool-update.in.in 2007-07-31 17:21:45.000000000 -0400
@@ -71,7 +71,8 @@ my $xml_support =
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
+"kbd(?:\\.in)+|". # GOK specific.
+"policy(?:\\.in)+"; # PolicyKit files
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
Index: intltool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- intltool.spec 29 Jul 2007 01:05:42 -0000 1.33
+++ intltool.spec 31 Jul 2007 22:30:17 -0000 1.34
@@ -4,7 +4,7 @@
Name: intltool
Summary: Utility for internationalizing various kinds of data files
Version: 0.35.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL
Group: Development/Tools
Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.t...
@@ -19,6 +19,8 @@
Patch0: intltool-0.35.5-path.patch
Patch1: intltool-0.35.5-dont-duplicate-msgid.patch
+# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=462312
+Patch2: intltool-0.35.5-polkit.patch
%description
This tool automatically extracts translatable strings from oaf, glade,
@@ -29,6 +31,7 @@
%setup -q
%patch0 -p1 -b .path
%patch1 -p1 -b .dont-duplicate-msgid
+%patch2 -p1 -b .polkit
%build
%configure
@@ -52,6 +55,9 @@
%{_mandir}/man*/*
%changelog
+* Tue Jul 31 2007 David Zeuthen <davidz(a)redhat.com> - 0.35.5-5
+- Add support for PolicyKit .policy files (b.g.o #462312)
+
* Sat Jul 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.35.5-4
- Don't produce useless debuginfo (#249969)
16 years, 1 month
rpms/gnome-launch-box/devel gnome-launch-box.desktop, NONE, 1.1 gnome-launch-box.spec, 1.5, 1.6
by fedora-extras-commits@redhat.com
Author: hadess
Update of /cvs/pkgs/rpms/gnome-launch-box/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135
Modified Files:
gnome-launch-box.spec
Added Files:
gnome-launch-box.desktop
Log Message:
* Tue Jul 31 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.4-3
- Add an autolauncher
--- NEW FILE gnome-launch-box.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Application Launcher
Exec=gnome-launch-box -n
Terminal=false
Type=Application
Categories=
Index: gnome-launch-box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-launch-box/devel/gnome-launch-box.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-launch-box.spec 9 Jul 2007 14:23:41 -0000 1.5
+++ gnome-launch-box.spec 31 Jul 2007 22:28:40 -0000 1.6
@@ -1,11 +1,12 @@
Summary: Funky application launcher
Name: gnome-launch-box
Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: Applications/Internet
URL: http://developer.imendio.com/projects/gnome-launch-box
Source0: http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
+Source1: gnome-launch-box.desktop
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): GConf2
@@ -38,6 +39,8 @@
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+install -m0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
+install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/gnome-launch-box.desktop
%find_lang %{name}
@@ -60,11 +63,15 @@
%defattr(-,root,root,-)
%doc ChangeLog AUTHORS README TODO COPYING
%{_sysconfdir}/gconf/schemas/gnome-launch-box.schemas
+%{_sysconfdir}/xdg/autostart/*
%{_bindir}/gnome-launch-box
%{_datadir}/gnome-launch-box
%{_datadir}/gnome-control-center/keybindings/90-gnome-launch-box.xml
%changelog
+* Tue Jul 31 2007 - Bastien Nocera <bnocera(a)redhat.com> - 0.4-3
+- Add an autolauncher
+
* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 0.4-2
- Require control-center-filesystem
16 years, 1 month
rpms/m2crypto/devel m2crypto-0.18-timeouts.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 m2crypto.spec, 1.34, 1.35 sources, 1.7, 1.8 m2crypto-0.17-Py_ssize_t.patch, 1.1, NONE m2crypto-0.17-timeouts.patch, 1.1, NONE m2crypto-0.17-xmlrpc.patch, 1.1, NONE
by fedora-extras-commits@redhat.com
Author: mitr
Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6750
Modified Files:
.cvsignore m2crypto.spec sources
Added Files:
m2crypto-0.18-timeouts.patch
Removed Files:
m2crypto-0.17-Py_ssize_t.patch m2crypto-0.17-timeouts.patch
m2crypto-0.17-xmlrpc.patch
Log Message:
* Wed Aug 1 2007 Miloslav Trmač <mitr(a)redhat.com> - 0.18-1
- Update to m2crypto-0.18
m2crypto-0.18-timeouts.patch:
--- NEW FILE m2crypto-0.18-timeouts.patch ---
diff -ur m2crypto-0.18/M2Crypto/SSL/Connection.py m2crypto/M2Crypto/SSL/Connection.py
--- m2crypto-0.18/M2Crypto/SSL/Connection.py 2007-06-15 23:34:05.000000000 +0200
+++ m2crypto/M2Crypto/SSL/Connection.py 2007-07-31 23:30:51.000000000 +0200
@@ -37,9 +37,11 @@
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self._fileno = self.socket.fileno()
-
- self.blocking = self.socket.gettimeout()
-
+
+ self._timeout = self.socket.gettimeout()
+ if self._timeout is None:
+ self._timeout = -1.0
+
self.ssl_close_flag = m2.bio_noclose
@@ -137,7 +139,7 @@
m2.ssl_set_accept_state(self.ssl)
def accept_ssl(self):
- return m2.ssl_accept(self.ssl)
+ return m2.ssl_accept(self.ssl, self._timeout)
def accept(self):
"""Accept an SSL connection. The return value is a pair (ssl, addr) where
@@ -159,7 +161,7 @@
m2.ssl_set_connect_state(self.ssl)
def connect_ssl(self):
- return m2.ssl_connect(self.ssl)
+ return m2.ssl_connect(self.ssl, self._timeout)
def connect(self, addr):
self.socket.connect(addr)
@@ -186,7 +188,7 @@
return m2.ssl_pending(self.ssl)
def _write_bio(self, data):
- return m2.ssl_write(self.ssl, data)
+ return m2.ssl_write(self.ssl, data, self._timeout)
def _write_nbio(self, data):
return m2.ssl_write_nbio(self.ssl, data)
@@ -194,7 +196,7 @@
def _read_bio(self, size=1024):
if size <= 0:
raise ValueError, 'size <= 0'
- return m2.ssl_read(self.ssl, size)
+ return m2.ssl_read(self.ssl, size, self._timeout)
def _read_nbio(self, size=1024):
if size <= 0:
@@ -202,13 +204,13 @@
return m2.ssl_read_nbio(self.ssl, size)
def write(self, data):
- if self.blocking:
+ if self._timeout != 0.0:
return self._write_bio(data)
return self._write_nbio(data)
sendall = send = write
def read(self, size=1024):
- if self.blocking:
+ if self._timeout != 0.0:
return self._read_bio(size)
return self._read_nbio(size)
recv = read
@@ -216,7 +218,17 @@
def setblocking(self, mode):
"""Set this connection's underlying socket to _mode_."""
self.socket.setblocking(mode)
- self.blocking = mode
+ if mode:
+ self._timeout = -1.0
+ else:
+ self._timeout = 0.0
+
+ def settimeout(self, timeout):
+ """Set this connection's underlying socket's timeout to _timeout_."""
+ self.socket.settimeout(timeout)
+ self._timeout = timeout
+ if self._timeout is None:
+ self._timeout = -1.0
def fileno(self):
return self.socket.fileno()
@@ -293,15 +305,8 @@
"""Set the cipher suites for this connection."""
return m2.ssl_set_cipher_list(self.ssl, cipher_list)
- def makefile(self, mode='rb', bufsize='ignored'):
- r = 'r' in mode or '+' in mode
- w = 'w' in mode or 'a' in mode or '+' in mode
- b = 'b' in mode
- m2mode = ['', 'r'][r] + ['', 'w'][w] + ['', 'b'][b]
- # XXX Need to dup().
- bio = BIO.BIO(self.sslbio, _close_cb=self.close)
- m2.bio_do_handshake(bio._ptr())
- return BIO.IOBuffer(bio, m2mode, _pyfree=0)
+ def makefile(self, mode='rb', bufsize=-1):
+ return socket._fileobject(self, mode, bufsize)
def getsockname(self):
return self.socket.getsockname()
diff -ur m2crypto-0.18/M2Crypto/SSL/__init__.py m2crypto/M2Crypto/SSL/__init__.py
--- m2crypto-0.18/M2Crypto/SSL/__init__.py 2006-03-20 20:26:28.000000000 +0100
+++ m2crypto/M2Crypto/SSL/__init__.py 2007-07-31 23:29:21.000000000 +0200
@@ -2,11 +2,14 @@
Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved."""
+import socket
+
# M2Crypto
from M2Crypto import m2
class SSLError(Exception): pass
-m2.ssl_init(SSLError)
+class SSLTimeoutError(SSLError, socket.timeout): pass
+m2.ssl_init(SSLError, SSLTimeoutError)
# M2Crypto.SSL
from Cipher import Cipher, Cipher_Stack
diff -ur m2crypto-0.18/SWIG/_ssl.i m2crypto/SWIG/_ssl.i
--- m2crypto-0.18/SWIG/_ssl.i 2007-06-05 02:30:11.000000000 +0200
+++ m2crypto/SWIG/_ssl.i 2007-08-01 00:06:34.000000000 +0200
@@ -8,10 +8,13 @@
%{
#include <pythread.h>
+#include <limits.h>
#include <openssl/bio.h>
#include <openssl/dh.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
+#include <poll.h>
+#include <sys/time.h>
%}
%apply Pointer NONNULL { SSL_CTX * };
@@ -142,6 +145,11 @@
%rename(ssl_session_get_timeout) SSL_SESSION_get_timeout;
extern long SSL_SESSION_get_timeout(CONST SSL_SESSION *);
+extern PyObject *ssl_accept(SSL *ssl, double timeout = -1);
+extern PyObject *ssl_connect(SSL *ssl, double timeout = -1);
+extern PyObject *ssl_read(SSL *ssl, int num, double timeout = -1);
+extern int ssl_write(SSL *ssl, PyObject *blob, double timeout = -1);
+
%constant int ssl_error_none = SSL_ERROR_NONE;
%constant int ssl_error_ssl = SSL_ERROR_SSL;
%constant int ssl_error_want_read = SSL_ERROR_WANT_READ;
@@ -197,14 +205,19 @@
%constant int SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER = SSL_MODE_ENABLE_PARTIAL_WRITE;
%constant int SSL_MODE_AUTO_RETRY = SSL_MODE_AUTO_RETRY;
+%ignore ssl_handle_error;
+%ignore ssl_sleep_with_timeout;
%inline %{
static PyObject *_ssl_err;
+static PyObject *_ssl_timeout_err;
-void ssl_init(PyObject *ssl_err) {
+void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
SSL_library_init();
SSL_load_error_strings();
Py_INCREF(ssl_err);
+ Py_INCREF(ssl_timeout_err);
_ssl_err = ssl_err;
+ _ssl_timeout_err = ssl_timeout_err;
}
void ssl_ctx_passphrase_callback(SSL_CTX *ctx, PyObject *pyfunc) {
@@ -358,36 +371,130 @@
return ret;
}
-PyObject *ssl_accept(SSL *ssl) {
+static void ssl_handle_error(int ssl_err, int ret) {
+ int err;
+
+ switch (ssl_err) {
+ case SSL_ERROR_SSL:
+ PyErr_SetString(_ssl_err,
+ ERR_reason_error_string(ERR_get_error()));
+ break;
+ case SSL_ERROR_SYSCALL:
+ err = ERR_get_error();
+ if (err)
+ PyErr_SetString(_ssl_err, ERR_reason_error_string(err));
+ else if (ret == 0)
+ PyErr_SetString(_ssl_err, "unexpected eof");
+ else if (ret == -1)
+ PyErr_SetFromErrno(_ssl_err);
+ else
+ assert(0);
+ break;
+ default:
+ PyErr_SetString(_ssl_err, "unexpected SSL error");
+ }
+}
+
+static int ssl_sleep_with_timeout(SSL *ssl, const struct timeval *start,
+ double timeout, int ssl_err) {
+ struct pollfd fd;
+ struct timeval tv;
+ int ms, tmp;
+
+ assert(timeout > 0);
+ again:
+ gettimeofday(&tv, NULL);
+ /* tv >= start */
+ if ((timeout + start->tv_sec - tv.tv_sec) > INT_MAX / 1000)
+ ms = -1;
+ else {
+ int fract;
+
+ ms = ((start->tv_sec + (int)timeout) - tv.tv_sec) * 1000;
+ fract = (start->tv_usec + (timeout - (int)timeout) * 1000000
+ - tv.tv_usec + 999) / 1000;
+ if (ms > 0 && fract > INT_MAX - ms)
+ ms = -1;
+ else {
+ ms += fract;
+ if (ms <= 0)
+ goto timeout;
+ }
+ }
+ switch (ssl_err) {
+ case SSL_ERROR_WANT_READ:
+ fd.fd = SSL_get_rfd(ssl);
+ fd.events = POLLIN;
+ break;
+
+ case SSL_ERROR_WANT_WRITE:
+ fd.fd = SSL_get_wfd(ssl);
+ fd.events = POLLOUT;
+ break;
+
+ case SSL_ERROR_WANT_X509_LOOKUP:
+ return 0; /* FIXME: is this correct? */
+
+ default:
+ assert(0);
+ }
+ if (fd.fd == -1) {
+ PyErr_SetString(_ssl_err, "timeout on a non-FD SSL");
+ return -1;
+ }
+ Py_BEGIN_ALLOW_THREADS
+ tmp = poll(&fd, 1, ms);
+ Py_END_ALLOW_THREADS
+ switch (tmp) {
+ case 1:
+ return 0;
+ case 0:
+ goto timeout;
+ case -1:
+ if (errno == EINTR)
+ goto again;
+ PyErr_SetFromErrno(_ssl_err);
+ return -1;
+ }
+ return 0;
+
+ timeout:
+ PyErr_SetNone(_ssl_timeout_err);
+ return -1;
+}
+
+PyObject *ssl_accept(SSL *ssl, double timeout) {
PyObject *obj = NULL;
- int r, err;
+ int r, ssl_err;
+ struct timeval tv;
+ if (timeout > 0)
+ gettimeofday(&tv, NULL);
+ again:
Py_BEGIN_ALLOW_THREADS
r = SSL_accept(ssl);
+ ssl_err = SSL_get_error(ssl, r);
Py_END_ALLOW_THREADS
- switch (SSL_get_error(ssl, r)) {
+ switch (ssl_err) {
case SSL_ERROR_NONE:
case SSL_ERROR_ZERO_RETURN:
obj = PyInt_FromLong((long)1);
break;
case SSL_ERROR_WANT_WRITE:
case SSL_ERROR_WANT_READ:
- obj = PyInt_FromLong((long)0);
- break;
- case SSL_ERROR_SSL:
- PyErr_SetString(_ssl_err, ERR_reason_error_string(ERR_get_error()));
+ if (timeout <= 0) {
+ obj = PyInt_FromLong((long)0);
+ break;
+ }
+ if (ssl_sleep_with_timeout(ssl, &tv, timeout, ssl_err) == 0)
+ goto again;
obj = NULL;
break;
+ case SSL_ERROR_SSL:
case SSL_ERROR_SYSCALL:
- err = ERR_get_error();
- if (err)
- PyErr_SetString(_ssl_err, ERR_reason_error_string(err));
- else if (r == 0)
- PyErr_SetString(_ssl_err, "unexpected eof");
- else if (r == -1)
- PyErr_SetFromErrno(_ssl_err);
+ ssl_handle_error(ssl_err, r);
obj = NULL;
break;
}
@@ -396,36 +503,38 @@
return obj;
}
-PyObject *ssl_connect(SSL *ssl) {
+PyObject *ssl_connect(SSL *ssl, double timeout) {
PyObject *obj = NULL;
- int r, err;
+ int r, ssl_err;
+ struct timeval tv;
+ if (timeout > 0)
+ gettimeofday(&tv, NULL);
+ again:
Py_BEGIN_ALLOW_THREADS
r = SSL_connect(ssl);
+ ssl_err = SSL_get_error(ssl, r);
Py_END_ALLOW_THREADS
- switch (SSL_get_error(ssl, r)) {
+ switch (ssl_err) {
case SSL_ERROR_NONE:
case SSL_ERROR_ZERO_RETURN:
obj = PyInt_FromLong((long)1);
break;
case SSL_ERROR_WANT_WRITE:
case SSL_ERROR_WANT_READ:
- obj = PyInt_FromLong((long)0);
- break;
- case SSL_ERROR_SSL:
- PyErr_SetString(_ssl_err, ERR_reason_error_string(ERR_get_error()));
+ if (timeout <= 0) {
+ obj = PyInt_FromLong((long)0);
+ break;
+ }
+ if (ssl_sleep_with_timeout(ssl, &tv, timeout, ssl_err) == 0)
+ goto again;
obj = NULL;
break;
+ case SSL_ERROR_SSL:
case SSL_ERROR_SYSCALL:
- err = ERR_get_error();
- if (err)
- PyErr_SetString(_ssl_err, ERR_reason_error_string(err));
- else if (r == 0)
- PyErr_SetString(_ssl_err, "unexpected eof");
- else if (r == -1)
- PyErr_SetFromErrno(_ssl_err);
+ ssl_handle_error(ssl_err, r);
obj = NULL;
break;
}
@@ -438,10 +547,11 @@
SSL_set_shutdown(ssl, mode);
}
-PyObject *ssl_read(SSL *ssl, int num) {
+PyObject *ssl_read(SSL *ssl, int num, double timeout) {
PyObject *obj = NULL;
void *buf;
- int r, err;
+ int r;
+ struct timeval tv;
if (!(buf = PyMem_Malloc(num))) {
PyErr_SetString(PyExc_MemoryError, "ssl_read");
@@ -449,37 +559,44 @@
}
+ if (timeout > 0)
+ gettimeofday(&tv, NULL);
+ again:
Py_BEGIN_ALLOW_THREADS
r = SSL_read(ssl, buf, num);
Py_END_ALLOW_THREADS
- switch (SSL_get_error(ssl, r)) {
- case SSL_ERROR_NONE:
- case SSL_ERROR_ZERO_RETURN:
- buf = PyMem_Realloc(buf, r);
- obj = PyString_FromStringAndSize(buf, r);
- break;
- case SSL_ERROR_WANT_WRITE:
- case SSL_ERROR_WANT_READ:
- case SSL_ERROR_WANT_X509_LOOKUP:
- Py_INCREF(Py_None);
- obj = Py_None;
- break;
- case SSL_ERROR_SSL:
- PyErr_SetString(_ssl_err, ERR_reason_error_string(ERR_get_error()));
- obj = NULL;
- break;
- case SSL_ERROR_SYSCALL:
- err = ERR_get_error();
- if (err)
- PyErr_SetString(_ssl_err, ERR_reason_error_string(err));
- else if (r == 0)
- PyErr_SetString(_ssl_err, "unexpected eof");
- else if (r == -1)
- PyErr_SetFromErrno(_ssl_err);
- obj = NULL;
- break;
+ if (r >= 0) {
+ buf = PyMem_Realloc(buf, r);
+ obj = PyString_FromStringAndSize(buf, r);
+ } else {
+ int ssl_err;
+
+ ssl_err = SSL_get_error(ssl, r);
+ switch (ssl_err) {
+ case SSL_ERROR_NONE:
+ case SSL_ERROR_ZERO_RETURN:
+ assert(0);
+
+ case SSL_ERROR_WANT_WRITE:
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_X509_LOOKUP:
+ if (timeout <= 0) {
+ Py_INCREF(Py_None);
+ obj = Py_None;
+ break;
+ }
+ if (ssl_sleep_with_timeout(ssl, &tv, timeout, ssl_err) == 0)
+ goto again;
+ obj = NULL;
+ break;
+ case SSL_ERROR_SSL:
+ case SSL_ERROR_SYSCALL:
+ ssl_handle_error(ssl_err, r);
+ obj = NULL;
+ break;
+ }
}
PyMem_Free(buf);
@@ -537,22 +654,26 @@
return obj;
}
-int ssl_write(SSL *ssl, PyObject *blob) {
+int ssl_write(SSL *ssl, PyObject *blob, double timeout) {
const void *buf;
- int len, r, err, ret;
+ int len, r, ssl_err, ret;
+ struct timeval tv;
if (m2_PyObject_AsReadBufferInt(blob, &buf, &len) == -1) {
return -1;
}
-
+ if (timeout > 0)
+ gettimeofday(&tv, NULL);
+ again:
Py_BEGIN_ALLOW_THREADS
r = SSL_write(ssl, buf, len);
+ ssl_err = SSL_get_error(ssl, r);
Py_END_ALLOW_THREADS
- switch (SSL_get_error(ssl, r)) {
+ switch (ssl_err) {
case SSL_ERROR_NONE:
case SSL_ERROR_ZERO_RETURN:
ret = r;
@@ -560,20 +681,17 @@
case SSL_ERROR_WANT_WRITE:
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_X509_LOOKUP:
+ if (timeout <= 0) {
+ ret = -1;
+ break;
+ }
+ if (ssl_sleep_with_timeout(ssl, &tv, timeout, ssl_err) == 0)
+ goto again;
ret = -1;
break;
case SSL_ERROR_SSL:
- PyErr_SetString(_ssl_err, ERR_reason_error_string(ERR_get_error()));
- ret = -1;
- break;
case SSL_ERROR_SYSCALL:
- err = ERR_get_error();
- if (err)
- PyErr_SetString(_ssl_err, ERR_reason_error_string(ERR_get_error()));
- else if (r == 0)
- PyErr_SetString(_ssl_err, "unexpected eof");
- else if (r == -1)
- PyErr_SetFromErrno(_ssl_err);
+ ssl_handle_error(ssl_err, r);
default:
ret = -1;
}
diff -ur m2crypto-0.18/tests/test_ssl.py m2crypto/tests/test_ssl.py
--- m2crypto-0.18/tests/test_ssl.py 2007-07-02 22:25:45.000000000 +0200
+++ m2crypto/tests/test_ssl.py 2007-07-31 23:29:21.000000000 +0200
@@ -887,6 +887,53 @@
class TwistedSSLClientTestCase(BaseSSLClientTestCase):
+ def test_timeout(self):
+ pid = self.start_server(self.args)
+ try:
+ ctx = SSL.Context()
+ s = SSL.Connection(ctx)
+ # Just a really small number so we can timeout
+ s.settimeout(0.000000000000000000000000000001)
+ self.assertRaises(SSL.SSLTimeoutError, s.connect, self.srv_addr)
+ s.close()
+ finally:
+ self.stop_server(pid)
+
+ def test_makefile_timeout(self):
+ # httpslib uses makefile to read the response
+ pid = self.start_server(self.args)
+ try:
+ from M2Crypto import httpslib
+ c = httpslib.HTTPS(srv_host, srv_port)
+ c.putrequest('GET', '/')
+ c.putheader('Accept', 'text/html')
+ c.putheader('Accept', 'text/plain')
+ c.endheaders()
+ c._conn.sock.settimeout(100)
+ err, msg, headers = c.getreply()
+ assert err == 200, err
+ f = c.getfile()
+ data = f.read()
+ c.close()
+ finally:
+ self.stop_server(pid)
+ self.failIf(string.find(data, 's_server -quiet -www') == -1)
+
+ def test_makefile_timeout_fires(self):
+ pid = self.start_server(self.args)
+ try:
+ from M2Crypto import httpslib
+ c = httpslib.HTTPS(srv_host, srv_port)
+ c.putrequest('GET', '/')
+ c.putheader('Accept', 'text/html')
+ c.putheader('Accept', 'text/plain')
+ c.endheaders()
+ c._conn.sock.settimeout(0.0000000001)
+ self.assertRaises(socket.timeout, c.getreply)
+ c.close()
+ finally:
+ self.stop_server(pid)
+
def test_twisted_wrapper(self):
# Test only when twisted and ZopeInterfaces are present
try:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 17 Jan 2007 15:21:38 -0000 1.7
+++ .cvsignore 31 Jul 2007 22:25:52 -0000 1.8
@@ -1 +1 @@
-m2crypto-0.17.tar.gz
+m2crypto-0.18.tar.gz
Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- m2crypto.spec 11 Jul 2007 21:52:15 -0000 1.34
+++ m2crypto.spec 31 Jul 2007 22:25:52 -0000 1.35
@@ -5,12 +5,10 @@
Summary: Support for using OpenSSL in python scripts
Name: m2crypto
-Version: 0.17
-Release: 3
+Version: 0.18
+Release: 1
Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version...
-Patch0: m2crypto-0.17-timeouts.patch
-Patch1: m2crypto-0.17-Py_ssize_t.patch
-Patch2: m2crypto-0.17-xmlrpc.patch
+Patch0: m2crypto-0.18-timeouts.patch
License: BSDish
Group: System Environment/Libraries
URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -25,8 +23,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1 -b .Py_ssize_t
-%patch2 -p1 -b .xmlrpc
# Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
# doesn't follow the #include.
@@ -78,6 +74,9 @@
%{python_sitearch}/M2Crypto
%changelog
+* Wed Aug 1 2007 Miloslav Trmač <mitr(a)redhat.com> - 0.18-1
+- Update to m2crypto-0.18
+
* Wed Jul 11 2007 Miloslav Trmač <mitr(a)redhat.com> - 0.17-3
- Try to fix build on Alpha
Resolves: #246828
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 17 Jan 2007 15:21:38 -0000 1.7
+++ sources 31 Jul 2007 22:25:52 -0000 1.8
@@ -1 +1 @@
-c67b45c752fd5e8115cd6b14831c5a38 m2crypto-0.17.tar.gz
+4e5432d08fd50287b80ac2237f01bda3 m2crypto-0.18.tar.gz
--- m2crypto-0.17-Py_ssize_t.patch DELETED ---
--- m2crypto-0.17-timeouts.patch DELETED ---
--- m2crypto-0.17-xmlrpc.patch DELETED ---
16 years, 1 month
rpms/glibmm24/devel .cvsignore, 1.18, 1.19 glibmm.spec, 1.24, 1.25 sources, 1.19, 1.20
by fedora-extras-commits@redhat.com
Author: denis
Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6725
Modified Files:
.cvsignore glibmm.spec sources
Log Message:
Update to 2.13.9
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 21 Jun 2007 14:56:17 -0000 1.18
+++ .cvsignore 31 Jul 2007 22:25:12 -0000 1.19
@@ -1 +1 @@
-glibmm-2.13.6.tar.bz2
+glibmm-2.13.9.tar.bz2
Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- glibmm.spec 2 Jul 2007 15:25:05 -0000 1.24
+++ glibmm.spec 31 Jul 2007 22:25:12 -0000 1.25
@@ -1,6 +1,6 @@
Name: glibmm24
-Version: 2.13.6
-Release: 3%{?dist}
+Version: 2.13.9
+Release: 1%{?dist}
Summary: C++ interface for GTK2 (a GUI library for X)
Group: System Environment/Libraries
@@ -77,6 +77,9 @@
%changelog
+* Wed Aug 1 2007 Denis Leroy <denis(a)poolshark.org> - 2.13.9-1
+- Update to 2.13.9
+
* Tue Jul 3 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.13.6-3
- Rebuild against newest GLib (due to #245141, #245634)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 21 Jun 2007 14:56:17 -0000 1.19
+++ sources 31 Jul 2007 22:25:12 -0000 1.20
@@ -1 +1 @@
-6d24d51a1d3ca31006c43e3768d7f053 glibmm-2.13.6.tar.bz2
+1fa5cf54cbecadc68e8be5b25f5b11ea glibmm-2.13.9.tar.bz2
16 years, 1 month
rpms/sofsip-cli/devel sofsip-cli.spec,1.2,1.3
by fedora-extras-commits@redhat.com
Author: jcollie
Update of /cvs/pkgs/rpms/sofsip-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5923
Modified Files:
sofsip-cli.spec
Log Message:
Enable farsight media implementation.
Index: sofsip-cli.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sofsip-cli/devel/sofsip-cli.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sofsip-cli.spec 31 Jul 2007 20:23:53 -0000 1.2
+++ sofsip-cli.spec 31 Jul 2007 22:01:50 -0000 1.3
@@ -1,6 +1,6 @@
Name: sofsip-cli
Version: 0.13
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SIP VoIP/IM example client
Group: Applications/Internet
@@ -14,6 +14,7 @@
BuildRequires: sofia-sip-glib-devel >= 1.12.6
BuildRequires: readline-devel
BuildRequires: gstreamer-devel
+BuildRequires: farsight-devel
Requires: gstreamer-plugins-base
Requires: gstreamer-plugins-good
Requires: gstreamer-plugins-farsight
@@ -29,7 +30,7 @@
%setup -q
%build
-%configure
+%configure --enable-farsight
make %{?_smp_mflags}
%install
@@ -47,6 +48,9 @@
%{_mandir}/man1/sofsip_cli.1*
%changelog
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff(a)ocjtech.us> - 0.13-3
+- Enable farsight media implementation.
+
* Tue Jul 31 2007 Jeffrey C. Ollie <jeff(a)ocjtech.us> - 0.13-2
- BR gstreamer-devel
16 years, 1 month
rpms/sofia-sip/FC-6 sofia-sip.spec,1.3,1.4
by fedora-extras-commits@redhat.com
Author: jcollie
Update of /cvs/pkgs/rpms/sofia-sip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30466
Modified Files:
sofia-sip.spec
Log Message:
Enable build on PPC64
Index: sofia-sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sofia-sip/FC-6/sofia-sip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sofia-sip.spec 3 Jul 2007 19:25:23 -0000 1.3
+++ sofia-sip.spec 31 Jul 2007 21:50:58 -0000 1.4
@@ -1,6 +1,6 @@
Name: sofia-sip
Version: 1.12.6
-Release: 8%{?dist}
+Release: 10%{?dist}
Summary: Sofia SIP User-Agent library
Group: System Environment/Libraries
@@ -20,9 +20,6 @@
BuildRequires: autoconf
BuildRequires: automake
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=246609
-ExcludeArch: ppc64
-
%description
Sofia SIP is a RFC-3261-compliant library for SIP user agents and
other network elements. The Session Initiation Protocol (SIP) is an
@@ -148,6 +145,12 @@
%{_mandir}/man1/*.1*
%changelog
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff(a)ocjtech.us> - 1.12.6-10
+- Clean up
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff(a)ocjtech.us> - 1.12.6-9
+- Enable building on PPC64
+
* Tue Jul 3 2007 Jeffrey C. Ollie <jeff(a)ocjtech.us> - 1.12.6-8
- Disable checks for now, they all pass in local mock builds but fail when built with plague.
16 years, 1 month