openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2014
- 1 participants
- 1675 discussions
Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2014-09-01 16:58:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2014-06-02 07:00:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2014-09-01 16:58:52.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Aug 28 13:20:17 UTC 2014 - ddiss(a)suse.com
+
+- Support non-default ctdbd socket paths; (bnc#893154).
+- 3.1.12
+
+-------------------------------------------------------------------
+Fri Aug 22 17:48:20 UTC 2014 - ddiss(a)suse.com
+
+- Support separately defined Samba resources; don't manipulate the
+ ctdb_manages_winbind parameter during join; (bnc#892982).
+- 3.1.11
+
+-------------------------------------------------------------------
+Thu Aug 21 17:12:19 UTC 2014 - ddiss(a)suse.com
+
+- Fix CTDB resource primitive path regular expression; (bnc#892975).
+- 3.1.10
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-3.1.9.tar.bz2
New:
----
yast2-samba-client-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.vkTaGO/_old 2014-09-01 16:58:54.000000000 +0200
+++ /var/tmp/diff_new_pack.vkTaGO/_new 2014-09-01 16:58:54.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.9
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-client-3.1.9.tar.bz2 -> yast2-samba-client-3.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.9/package/yast2-samba-client.changes new/yast2-samba-client-3.1.12/package/yast2-samba-client.changes
--- old/yast2-samba-client-3.1.9/package/yast2-samba-client.changes 2014-05-28 11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/package/yast2-samba-client.changes 2014-08-28 19:03:08.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Thu Aug 28 13:20:17 UTC 2014 - ddiss(a)suse.com
+
+- Support non-default ctdbd socket paths; (bnc#893154).
+- 3.1.12
+
+-------------------------------------------------------------------
+Fri Aug 22 17:48:20 UTC 2014 - ddiss(a)suse.com
+
+- Support separately defined Samba resources; don't manipulate the
+ ctdb_manages_winbind parameter during join; (bnc#892982).
+- 3.1.11
+
+-------------------------------------------------------------------
+Thu Aug 21 17:12:19 UTC 2014 - ddiss(a)suse.com
+
+- Fix CTDB resource primitive path regular expression; (bnc#892975).
+- 3.1.10
+
+-------------------------------------------------------------------
Tue May 27 16:00:17 UTC 2014 - noel.power(a)suse.com
- Mark some strings for translation; (bnc#877744)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.9/package/yast2-samba-client.spec new/yast2-samba-client-3.1.12/package/yast2-samba-client.spec
--- old/yast2-samba-client-3.1.9/package/yast2-samba-client.spec 2014-05-28 11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/package/yast2-samba-client.spec 2014-08-28 19:03:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 3.1.9
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.9/src/modules/SambaNetJoin.pm new/yast2-samba-client-3.1.12/src/modules/SambaNetJoin.pm
--- old/yast2-samba-client-3.1.9/src/modules/SambaNetJoin.pm 2014-05-28 11:24:18.000000000 +0200
+++ new/yast2-samba-client-3.1.12/src/modules/SambaNetJoin.pm 2014-08-28 19:03:08.000000000 +0200
@@ -109,7 +109,7 @@
# find out resource and clone ids, to do later crm operations with
my $show = CRMCall ("configure save -");
- if ($show =~ /primitive (\S+) ocf:heartbeat:CTDB/) {
+ if ($show =~ /primitive (\S+) (ocf:heartbeat:)?CTDB/) {
$rsc_id = $1;
}
else {
@@ -169,11 +169,6 @@
return FALSE unless $self->ClusterPresent (0);
- # 3. Run crm configure edit and search for the ctdb resource. Add the following line:
- # ctdb_manages_winbind="false"
-
- CRMCall ("resource param $rsc_id set ctdb_manages_winbind no");
-
# 4. save winbind into /etc/nsswitch.conf
# 5. Restart the NSC daemon:
SambaWinbind->AdjustNsswitch (TRUE, TRUE);
@@ -182,12 +177,18 @@
# 7. Cleanup CTDB:
CRMCall ("resource cleanup $rsc_id");
- # 8. Wait until the unhealty status disappears.
+ # 8. Wait until the unhealthy status disappears.
my $start = time;
my $wait = 60; # 1 minute timeout
+ my $ctdbd_socket = SambaConfig->GlobalGetStr("ctdbd socket", undef);
+ my $ctdb_args = "";
+ if (defined $ctdbd_socket) {
+ $ctdb_args = "--socket=$ctdbd_socket";
+ }
while (time<$start+$wait) {
- my $out = SCR->Execute(".target.bash_output", "/usr/bin/ctdb status");
+ my $out = SCR->Execute(".target.bash_output",
+ "/usr/bin/ctdb $ctdb_args status");
last if ($out->{"exit"} == 0);
sleep (1); #0.5);
}
@@ -207,16 +208,8 @@
return TRUE unless $cleanup_needed;
- # 10. Change the ctdb_manages_winbind option:
-
- # a. Stop the ctdb resource:
- CRMCall ("resource stop $rsc_id");
-
- # b. Change the value from false to true: ctdb_manages_winbind="true"
- CRMCall ("resource param $rsc_id set ctdb_manages_winbind yes");
-
- # c. Restart the ctdb resource:
- CRMCall ("resource start $rsc_id");
+ # Restart the ctdb resource, winbind will also be restarted with grouping:
+ CRMCall ("resource restart $rsc_id");
$cleanup_needed = FALSE;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2014-09-01 16:58:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old)
and /work/SRC/openSUSE:Factory/.xscreensaver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2014-06-26 10:42:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2014-09-01 16:58:49.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 15 18:09:43 UTC 2014 - gber(a)opensuse.org
+
+- add xscreensaver-disable-upgrade-nagging-message.patch in order
+ to disable nagging messages about upgrading to a newer version
+ (bnc#890595)
+
+-------------------------------------------------------------------
New:
----
xscreensaver-disable-upgrade-nagging-message.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xscreensaver.spec ++++++
--- /var/tmp/diff_new_pack.XZUVL9/_old 2014-09-01 16:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XZUVL9/_new 2014-09-01 16:58:52.000000000 +0200
@@ -55,8 +55,10 @@
Patch24: xscreensaver-slideshow-dri-detect.patch
Patch29: xscreensaver-ignore-no-pwent-password.patch
Patch32: xscreensaver-fireworkx-man.patch
-# PATCH-FIX-OPENSUSE xscreensaver-webcollage-dictpath.patch -- add /var/lib/dict/words to search path for word dictionaries -- seife+obs(a)b1-systems.com
+# PATCH-FIX-OPENSUSE xscreensaver-webcollage-dictpath.patch seife+obs(a)b1-systems.com -- add /var/lib/dict/words to search path for word dictionaries
Patch42: xscreensaver-webcollage-dictpath.patch
+# PATCH-FEATURE-OPENSUSE xscreensaver-disable-upgrade-nagging.patch bnc#890595 gber(a)opensuse.org -- Disable nagging messages about upgrading to a newer version
+Patch43: xscreensaver-disable-upgrade-nagging-message.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -119,6 +121,7 @@
%patch29
%patch32
%patch42 -p1
+%patch43 -p1
# KDE and GNOME have its own screensavers:
echo 'NotShowIn=KDE;GNOME;' >>driver/screensaver-properties.desktop.in
++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++
Index: xscreensaver-5.29/driver/prefs.c
===================================================================
--- xscreensaver-5.29.orig/driver/prefs.c
+++ xscreensaver-5.29/driver/prefs.c
@@ -1659,35 +1659,5 @@ stop_the_insanity (saver_preferences *p)
Bool
senescent_p (void)
{
- time_t now = time ((time_t *) 0);
- struct tm *tm = localtime (&now);
- const char *s = screensaver_id;
- char mon[4], year[5];
- int m, y, months;
- s = strchr (s, ' '); if (!s) abort(); s++;
- s = strchr (s, '('); if (!s) abort(); s++;
- s = strchr (s, '-'); if (!s) abort(); s++;
- strncpy (mon, s, 3);
- mon[3] = 0;
- s = strchr (s, '-'); if (!s) abort(); s++;
- strncpy (year, s, 4);
- year[4] = 0;
- y = atoi (year);
- if (!strcmp(mon, "Jan")) m = 0;
- else if (!strcmp(mon, "Feb")) m = 1;
- else if (!strcmp(mon, "Mar")) m = 2;
- else if (!strcmp(mon, "Apr")) m = 3;
- else if (!strcmp(mon, "May")) m = 4;
- else if (!strcmp(mon, "Jun")) m = 5;
- else if (!strcmp(mon, "Jul")) m = 6;
- else if (!strcmp(mon, "Aug")) m = 7;
- else if (!strcmp(mon, "Sep")) m = 8;
- else if (!strcmp(mon, "Oct")) m = 9;
- else if (!strcmp(mon, "Nov")) m = 10;
- else if (!strcmp(mon, "Dec")) m = 11;
- else abort();
- months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) -
- (y * 12 + m));
-
- return (months > 12);
+ return False;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at 2014-09-01 16:58:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
and /work/SRC/openSUSE:Factory/.dnsmasq.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2014-08-08 10:10:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2014-09-01 16:58:47.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Aug 26 14:05:14 CEST 2014 - dsterba(a)suse.cz
+
+- enable DNSSEC
+ - require libnettle
+ - package trust-anchors.conf
+- spec fixes:
+ - define HAVE_ flags on commandline, otherwise 'dnsmasq --version'
+ will not correctly reflect the feature status
+
+-------------------------------------------------------------------
+Fri Aug 22 07:08:36 UTC 2014 - meissner(a)suse.com
+
+- actually build with relro and pie. (bnc#893057)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dnsmasq.spec ++++++
--- /var/tmp/diff_new_pack.Acnj34/_old 2014-09-01 16:58:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Acnj34/_new 2014-09-01 16:58:49.000000000 +0200
@@ -35,6 +35,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
BuildRequires: libidn-devel
+BuildRequires: libnettle-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(libnetfilter_conntrack)
%if 0%{?suse_version} >= 1210
@@ -68,10 +69,11 @@
echo "#define HAVE_DBUS" >> src/config.h
echo "#define HAVE_CONNTRACK" >> src/config.h
echo "#define HAVE_IDN" >> src/config.h
+echo "#define HAVE_DNSSEC" >> src/config.h
mv po/no.po po/nb.po
-export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie"
+export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC"
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
-make %{?_smp_mflags} AWK=gawk all-i18n
+make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
make -C contrib/wrt %{?_smp_mflags}
%pre
@@ -110,6 +112,7 @@
install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service
install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
+install -D -m 0644 trust-anchors.conf %{buildroot}%{_datadir}/%{name}/trust-anchors.conf
# utils subpackage
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
@@ -139,6 +142,8 @@
%{_mandir}/man8/dnsmasq.8.gz
%config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf
%{_unitdir}/dnsmasq.service
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/trust-anchors.conf
%dir %attr(0750,tftp,tftp) /srv/tftpboot
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-09-01 16:58:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
and /work/SRC/openSUSE:Factory/.Mesa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa"
Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-08-20 17:52:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-09-01 16:58:41.000000000 +0200
@@ -1,0 +2,21 @@
+Mon Aug 25 10:34:26 UTC 2014 - sndirsch(a)suse.com
+
+- Update to version 10.3.0-RC1
+ * Mesa 10.3 brings many performance improvements, more
+ OpenGL 4.x functionality, the VC4 Gallium3D driver,
+ and much more.
+ * supersedes U_mesa-glx-Reduce-error-log-level.patch
+
+-------------------------------------------------------------------
+Sun Aug 24 12:59:50 UTC 2014 - dvlaeev(a)suse.com
+
+- Package vdpau_r600 for ppc64le as well (bnc#893275)
+
+-------------------------------------------------------------------
+Fri Aug 22 13:46:54 UTC 2014 - sndirsch(a)suse.com
+
+- u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
+ Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
+ (bnc#892896)
+
+-------------------------------------------------------------------
Old:
----
MesaLib-10.2.5.tar.bz2
U_mesa-glx-Reduce-error-log-level.patch
New:
----
MesaLib-10.3.0-rc1.tar.bz2
u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.DjrX84/_old 2014-09-01 16:58:44.000000000 +0200
+++ /var/tmp/diff_new_pack.DjrX84/_new 2014-09-01 16:58:44.000000000 +0200
@@ -29,7 +29,7 @@
%else
%define gallium_loader 0
%endif
-%ifarch %ix86 x86_64 %arm ppc64
+%ifarch %ix86 x86_64 %arm ppc64 ppc64le
%define vdpau_r600 1
%else
%define vdpau_r600 0
@@ -58,10 +58,10 @@
%endif
%define _name_archive MesaLib
-%define _version 10.2.5
+%define _version 10.3.0-rc1
Name: Mesa
-Version: 10.2.5
+Version: 10.3.0
Release: 0
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -149,7 +149,7 @@
Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
-Patch16: U_mesa-glx-Reduce-error-log-level.patch
+Patch17: u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -515,7 +515,7 @@
#%patch15 -p1
#%patch13 -p1
###
-%patch16 -p1
+%patch17 -p1
%build
rm -f src/mesa/depend
@@ -793,12 +793,14 @@
%defattr(-,root,root)
%_libdir/libXvMCnouveau.so
%_libdir/libXvMCnouveau.so.1
+%_libdir/libXvMCnouveau.so.1.0
%_libdir/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600
%defattr(-,root,root)
%_libdir/libXvMCr600.so
%_libdir/libXvMCr600.so.1
+%_libdir/libXvMCr600.so.1.0
%_libdir/libXvMCr600.so.1.0.0
%endif
@@ -807,6 +809,7 @@
%defattr(-,root,root)
%_libdir/vdpau/libvdpau_nouveau.so
%_libdir/vdpau/libvdpau_nouveau.so.1
+%_libdir/vdpau/libvdpau_nouveau.so.1.0
%_libdir/vdpau/libvdpau_nouveau.so.1.0.0
%endif
@@ -815,6 +818,7 @@
%defattr(-,root,root)
%_libdir/vdpau/libvdpau_r600.so
%_libdir/vdpau/libvdpau_r600.so.1
+%_libdir/vdpau/libvdpau_r600.so.1.0
%_libdir/vdpau/libvdpau_r600.so.1.0.0
%endif
@@ -823,6 +827,7 @@
%defattr(-,root,root)
%_libdir/vdpau/libvdpau_radeonsi.so
%_libdir/vdpau/libvdpau_radeonsi.so.1
+%_libdir/vdpau/libvdpau_radeonsi.so.1.0
%_libdir/vdpau/libvdpau_radeonsi.so.1.0.0
%endif
++++++ u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch ++++++
>From f69eca0843142d16c81cc3efd02fc50cf219cafd Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch(a)suse.de>
Date: Fri, 22 Aug 2014 14:35:06 +0200
Subject: [PATCH] Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
(bnc#892896)
Let's handle LIBGL_DEBUG env. variable in Mesa in a consistent way.
---
src/mesa/drivers/dri/common/xmlconfig.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index ce37647..8e48522 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -429,8 +429,10 @@ static void
__driUtilMessage(const char *f, ...)
{
va_list args;
+ const char *libgl_debug;
- if (getenv("LIBGL_DEBUG")) {
+ libgl_debug=getenv("LIBGL_DEBUG");
+ if (libgl_debug && !strstr(libgl_debug, "quiet")) {
fprintf(stderr, "libGL: ");
va_start(args, f);
vfprintf(stderr, f, args);
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package hostapd.2969 for openSUSE:13.1:Update checked in at 2014-09-01 08:32:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/hostapd.2969 (Old)
and /work/SRC/openSUSE:13.1:Update/.hostapd.2969.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hostapd.2969"
Changes:
--------
New Changes file:
--- /dev/null 2014-07-24 01:57:42.080040256 +0200
+++ /work/SRC/openSUSE:13.1:Update/.hostapd.2969.new/hostapd.changes 2014-09-01 08:32:56.000000000 +0200
@@ -0,0 +1,677 @@
+-------------------------------------------------------------------
+Sat Aug 23 11:42:49 UTC 2014 - ralf.habacker(a)freenet.de
+
+- enable-wired-driver.patch: This update enables the wired driver which
+ is required to support wired IEEE 802.1X authentication via any ethernet
+ driver as mentioned in the description.
+
+-------------------------------------------------------------------
+Wed Oct 2 15:33:43 UTC 2013 - dvaleev(a)suse.com
+
+- fix host_to_le32 undefined on BigEndian architectures
+ (hostapd-be-host_to_le.patch)
+
+-------------------------------------------------------------------
+Thu Apr 18 08:05:13 UTC 2013 - aj(a)suse.com
+
+- Do not package /etc/init.d
+- Do not install init file since package contains a service file and
+ is only build for Factory
+- Cleanup spec file
+- Use /run instead of /var/run
+
+-------------------------------------------------------------------
+Wed Apr 17 16:14:02 UTC 2013 - cfarrell(a)suse.com
+
+- license update: GPL-2.0 or BSD-3-Clause
+ README makes it clear that this is a dual license - i.e. choice of either
+ or
+
+-------------------------------------------------------------------
+Tue Apr 9 17:49:22 UTC 2013 - avm-xandry(a)yandex.ru
+
+- update to version 2.0
+- fix corrected file name hostapd.dif to hostapd.diff
+- in default config includes all features (IEEE 802.11w, Hotspot 2.0, IEEE 802.11ac, WPS, etc.)
+
+-------------------------------------------------------------------
+Tue Nov 6 04:41:17 UTC 2012 - crrodriguez(a)opensuse.org
+
+- Add Native systemd units
+
+-------------------------------------------------------------------
+Tue May 15 04:55:22 UTC 2012 - glin(a)suse.com
+
+- update to version 1.0
+- respin hostapd.dif to fit the new defconfig
+- change the file permission of the config files with passwords
+ to 600 (bnc#740964)
+
+-------------------------------------------------------------------
+Wed Oct 12 08:46:43 UTC 2011 - lnussel(a)suse.de
+
+- update to version 0.7.3
+- don't use /tmp for dump file in default config
+- verbose build
+- fix build for older distros
+- enable driver 'none' for radius only mode
+- add init script
+
+-------------------------------------------------------------------
+Fri Sep 30 15:22:48 UTC 2011 - uli(a)suse.com
+
+- cross-build fix: use %__cc macro
+
+-------------------------------------------------------------------
+Fri Sep 16 12:02:37 UTC 2011 - jengelh(a)medozas.de
+
+- Select libnl-1_1-devel
+
+-------------------------------------------------------------------
+Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de
+
+- Use %_smp_mflags
+
+-------------------------------------------------------------------
+Wed Jun 9 05:32:08 CEST 2010 - sndirsch(a)suse.de
+
+- udpated to release 0.6.10
+- updated hostapd.dif
+- git-commit-eb1f744.diff:
+ * Move DTIM period configuration into Beacon set operation; fixes
+ "Could not set DTIM period for kernel driver; wlan0: Unable to
+ setup interface.rmdir[ctrl_interface]: No such file or
+ directory" error when using "nl80211" driver
+
+-------------------------------------------------------------------
+Wed Sep 24 00:58:59 CEST 2008 - ro(a)suse.de
+
+- drop buildreq for madwifi (dropped package)
+
+-------------------------------------------------------------------
+Tue Sep 23 01:14:12 CEST 2008 - ro(a)suse.de
+
+- updae to version 0.5.10, changes:
+ * fixed EAP-SIM and EAP-AKA message parser to validate attribute
+ lengths properly to avoid potential crash caused by invalid messages
+ * fixed Reassociation Response callback processing when using internal
+ MLME (driver_{hostap,devicescape,test}.c)
+ * fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+ be used
+ * added a workaround for EAP-SIM/AKA peers that include incorrect null
+ termination in the username
+ * fixed EAP-SIM Start response processing for fast reauthentication
+ case
+ * copy optional Proxy-State attributes into RADIUS response when acting
+ as a RADIUS authentication server
+
+- update to version 0.5.9, changes:
+ * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+ draft (draft-ietf-emu-eap-gpsk-07.txt)
+ * fixed debugging code not to use potentially unaligned read to fetch
+ IPv4 addresses
+
+-------------------------------------------------------------------
+Mon Jan 21 14:54:48 CET 2008 - cstender(a)suse.de
+
+- fixed madwifi include dir (b.n.c #350982)
+
+-------------------------------------------------------------------
+Mon Jul 30 16:57:16 CEST 2007 - jg(a)suse.de
+
+- update to version 0.5.8, changes:
+ * updated driver_devicescape.c to build with the current
+ wireless-dev.git tree and net/d80211 changes
+ * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+ draft (draft-ietf-emu-eap-gpsk-03.txt)
+ * fixed EAP-MSCHAPv2 server to use a space between S and M parameters
+ in Success Request [Bug 203]
+ * added support for sending EAP-AKA Notifications in error cases
+ * RADIUS server: added support for processing duplicate messages
+ (retransmissions from RADIUS client) by replying with the previous
+ reply
+
+-------------------------------------------------------------------
+Wed Mar 14 17:27:32 CET 2007 - jg(a)suse.de
+
+- split off hostapd in its own package
+- update to version 0.5.7, changes (shortened):
+ * fixed EAP-PSK bit ordering of the Flags field
+ * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs
+ * fixed IPv6 connection to RADIUS accounting server
+ * added support for configuring and controlling multiple BSSes per
+ radio interface (bss=<ifname> in hostapd.conf)
+ * added support for dynamic VLAN configuration
+ * driver_madwifi: fixed configuration of unencrypted modes
+ * added preliminary implementation of IEEE 802.11w/D1.0 (management
+ frame protection)
+ * fixed session timeout processing with drivers that do not use
+ ieee802_11.c (e.g., madwifi)
+ * added 'hostapd_cli new_sta <addr>' command for adding a new STA
+ into hostapd
+ * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1
+ when using WPA2 even if PMKSA caching is not used
+ * added -P<pid file> argument for hostapd to write the current
+ process id into a file
+ * added support for RADIUS Authentication Server MIB (RFC 2619)
+ * added support for EAP Generalized Pre-Shared Key
+ * fixed a segmentation fault when RSN pre-authentication was
+ completed successfully
+ * added support for EAP-SAKE
+ * driver_madwifi: added support for getting station RSN IE from
+ madwifi-ng svn r1453 and newer
+ * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE)
+ * added ap_max_inactivity configuration parameter
+ * added support for EAP expanded type (vendor specific EAP methods)
+ * added support for using EAP-SIM pseudonyms and fast re-authentication
+ * added support for EAP-AKA in the integrated EAP authenticator
+
+-------------------------------------------------------------------
+Mon Sep 18 14:13:31 CEST 2006 - jg(a)suse.de
+
+- hostap-utils: Fixed usage of uninitialised variable (bug 184410)
+- hostapd: Update to version 0.4.9, changes:
+ * added a new configuration option, eapol_version, that can be
+ used to set EAPOL version to 1 (default is 2) to work around
+ broken client implementations that drop EAPOL frames which use
+ version number 2 [Bug 89]
+ * fixed EAP-MSCHAPv2 message length validation
+ * fixed stdarg use in hostapd_logger(): if both stdout and syslog
+ logging was enabled, hostapd could trigger a segmentation fault
+ in vsyslog on some CPU -- C library combinations
+
+-------------------------------------------------------------------
+Sun Feb 5 19:37:30 CET 2006 - ro(a)suse.de
+
+- use madwifi-devel in BuildRequires
+
+-------------------------------------------------------------------
+Sun Feb 5 17:09:48 CET 2006 - aj(a)suse.de
+
+- Remove BuildRequires on km_wlan.
+
+-------------------------------------------------------------------
+Wed Jan 25 21:36:28 CET 2006 - mls(a)suse.de
+
+- converted neededforbuild to BuildRequires
+
++++ 480 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.1:Update/.hostapd.2969.new/hostapd.changes
New:
----
enable-wired-driver.patch
hostapd-2.0.tar.gz
hostapd-be-host_to_le.patch
hostapd-tmp.diff
hostapd.changes
hostapd.diff
hostapd.service
hostapd.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hostapd.spec ++++++
#
# spec file for package hostapd
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: hostapd
BuildRequires: libnl-1_1-devel
BuildRequires: openssl-devel
BuildRequires: sqlite3-devel
BuildRequires: pkgconfig(systemd)
Summary: Turns Your WLAN Card into a WPA capable Access Point
License: GPL-2.0 or BSD-3-Clause
Group: Hardware/Wifi
Version: 2.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://hostap.epitest.fi/
Source: http://hostap.epitest.fi/releases/hostapd-%{version}.tar.gz
Source1: hostapd.service
Patch0: hostapd.diff
Patch1: hostapd-tmp.diff
Patch2: hostapd-be-host_to_le.patch
Patch3: enable-wired-driver.patch
%{?systemd_requires}
%description
hostapd is a user space daemon for access point and authentication
servers. It implements IEEE 802.11 access point management, IEEE
802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and
RADIUS authentication server. Currently, hostapd supports HostAP,
madwifi, and prism54 drivers. It also supports wired IEEE 802.1X
authentication via any ethernet driver.
%prep
%setup -q -n hostapd-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
cd hostapd
cp defconfig .config
%build
cd hostapd
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS)" CC="%{__cc}" make %{?_smp_mflags} V=1
%install
cd hostapd
mkdir -p %{buildroot}/%{_sbindir}
mkdir %{buildroot}/etc
mkdir -p %{buildroot}/%{_mandir}/man8
install -m 755 hostapd %{buildroot}/%{_sbindir}
ln -s /usr/sbin/service %{buildroot}/%{_sbindir}/rchostapd
install -m 755 hostapd_cli %{buildroot}/%{_sbindir}
install -m 600 hostapd.conf %{buildroot}/etc
install -m 644 hostapd.accept %{buildroot}/etc
install -m 644 hostapd.deny %{buildroot}/etc
install -m 600 hostapd.eap_user %{buildroot}/etc
install -m 600 hostapd.radius_clients %{buildroot}/etc
install -m 644 hostapd.sim_db %{buildroot}/etc
install -m 644 hostapd.vlan %{buildroot}/etc
install -m 600 hostapd.wpa_psk %{buildroot}/etc
install -m 644 hostapd.8 %{buildroot}/%{_mandir}/man8
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/hostapd.service
%pre
%service_add_pre hostapd.service
%post
%service_add_post hostapd.service
%preun
%service_del_preun hostapd.service
%postun
%service_del_postun hostapd.service
%files
%defattr(-,root,root)
%config(noreplace) /etc/hostapd.*
%{_sbindir}/*
%doc hostapd/ChangeLog COPYING hostapd/README hostapd/wired.conf hostapd/hostapd.conf
%doc %{_mandir}/man8/*
%{_unitdir}/hostapd.service
%changelog
++++++ enable-wired-driver.patch ++++++
--- a/hostapd/defconfig.orig 2014-08-20 22:04:06.968196030 +0200
+++ b/hostapd/defconfig 2014-08-20 22:03:20.520197639 +0200
@@ -13,7 +13,7 @@
CONFIG_DRIVER_HOSTAP=y
# Driver interface for wired authenticator
-#CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_WIRED=y
# Driver interface for madwifi driver
#CONFIG_DRIVER_MADWIFI=y
++++++ hostapd-be-host_to_le.patch ++++++
Index: hostapd-2.0/src/utils/common.h
===================================================================
--- hostapd-2.0.orig/src/utils/common.h
+++ hostapd-2.0/src/utils/common.h
@@ -207,6 +207,7 @@ static inline unsigned int wpa_swap_32(u
#define le_to_host32(n) bswap_32(n)
#define be_to_host32(n) (n)
#define host_to_be32(n) (n)
+#define host_to_le32(n) bswap_32(n)
#define le_to_host64(n) bswap_64(n)
#define host_to_le64(n) bswap_64(n)
#define be_to_host64(n) (n)
++++++ hostapd-tmp.diff ++++++
Index: hostapd-0.7.3/hostapd/hostapd.conf
===================================================================
--- hostapd-0.7.3.orig/hostapd/hostapd.conf
+++ hostapd-0.7.3/hostapd/hostapd.conf
@@ -52,7 +52,7 @@ logger_stdout=-1
logger_stdout_level=2
# Dump file for state information (on SIGUSR1)
-dump_file=/tmp/hostapd.dump
+dump_file=/run/hostapd.dump
# Interface for separate control program. If this is specified, hostapd
# will create this directory and a UNIX domain socket for listening to requests
++++++ hostapd.diff ++++++
--- hostapd/defconfig 2013-01-12 21:42:53.000000000 +0600
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -30,7 +30,7 @@
#LIBS_c += -L/usr/local/lib
# Driver interface for no driver (e.g., RADIUS server only)
-#CONFIG_DRIVER_NONE=y
+CONFIG_DRIVER_NONE=y
# IEEE 802.11F/IAPP
CONFIG_IAPP=y
@@ -45,7 +45,7 @@
# This version is an experimental implementation based on IEEE 802.11w/D1.0
# draft and is subject to change since the standard has not yet been finalized.
# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
# Integrated EAP server
CONFIG_EAP=y
@@ -69,53 +69,53 @@
CONFIG_EAP_TTLS=y
# EAP-SIM for the integrated EAP server
-#CONFIG_EAP_SIM=y
+CONFIG_EAP_SIM=y
# EAP-AKA for the integrated EAP server
-#CONFIG_EAP_AKA=y
+CONFIG_EAP_AKA=y
# EAP-AKA' for the integrated EAP server
# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
+CONFIG_EAP_AKA_PRIME=y
# EAP-PAX for the integrated EAP server
-#CONFIG_EAP_PAX=y
+CONFIG_EAP_PAX=y
# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
+CONFIG_EAP_PSK=y
# EAP-pwd for the integrated EAP server (secure authentication with a password)
-#CONFIG_EAP_PWD=y
+CONFIG_EAP_PWD=y
# EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
+CONFIG_EAP_SAKE=y
# EAP-GPSK for the integrated EAP server
-#CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK=y
# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_GPSK_SHA256=y
# EAP-FAST for the integrated EAP server
# Note: Default OpenSSL package does not include support for all the
# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
# to add the needed functions.
-#CONFIG_EAP_FAST=y
+CONFIG_EAP_FAST=y
# Wi-Fi Protected Setup (WPS)
-#CONFIG_WPS=y
+CONFIG_WPS=y
# Enable WSC 2.0 support
-#CONFIG_WPS2=y
+CONFIG_WPS2=y
# Enable UPnP support for external WPS Registrars
-#CONFIG_WPS_UPNP=y
+CONFIG_WPS_UPNP=y
# Enable WPS support with NFC config method
-#CONFIG_WPS_NFC=y
+CONFIG_WPS_NFC=y
# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
+CONFIG_EAP_IKEV2=y
# Trusted Network Connect (EAP-TNC)
-#CONFIG_EAP_TNC=y
+CONFIG_EAP_TNC=y
# PKCS#12 (PFX) support (used to read private key and certificate file from
# a file that usually has extension .p12 or .pfx)
@@ -123,27 +123,27 @@
# RADIUS authentication server. This provides access to the integrated EAP
# server from external hosts using RADIUS.
-#CONFIG_RADIUS_SERVER=y
+CONFIG_RADIUS_SERVER=y
# Build IPv6 support for RADIUS operations
CONFIG_IPV6=y
# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
+CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without
# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
-#CONFIG_DRIVER_RADIUS_ACL=y
+CONFIG_DRIVER_RADIUS_ACL=y
# IEEE 802.11n (High Throughput) support
-#CONFIG_IEEE80211N=y
+CONFIG_IEEE80211N=y
# Wireless Network Management (IEEE Std 802.11v-2011)
# Note: This is experimental and not complete implementation.
-#CONFIG_WNM=y
+CONFIG_WNM=y
# IEEE 802.11ac (Very High Throughput) support
-#CONFIG_IEEE80211AC=y
+CONFIG_IEEE80211AC=y
# Remove debugging code that is printing out debug messages to stdout.
# This can be used to reduce the size of the hostapd considerably if debugging
@@ -165,7 +165,7 @@
# Enable support for fully dynamic VLANs. This enables hostapd to
# automatically create bridge and VLAN interfaces if necessary.
-#CONFIG_FULL_DYNAMIC_VLAN=y
+CONFIG_FULL_DYNAMIC_VLAN=y
# Use netlink-based kernel API for VLAN operations instead of ioctl()
# Note: This requires libnl 3.1 or newer.
@@ -235,11 +235,11 @@
# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
# can be enabled to get a stronger construction of messages when block ciphers
# are used.
-#CONFIG_TLSV11=y
+CONFIG_TLSV11=y
# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
# can be enabled to enable use of stronger crypto algorithms.
-#CONFIG_TLSV12=y
+CONFIG_TLSV12=y
# If CONFIG_TLS=internal is used, additional library and include paths are
# needed for LibTomMath. Alternatively, an integrated, minimal version of
@@ -260,10 +260,10 @@
# Interworking (IEEE 802.11u)
# This can be used to enable functionality to improve interworking with
# external networks.
-#CONFIG_INTERWORKING=y
+CONFIG_INTERWORKING=y
# Hotspot 2.0
-#CONFIG_HS20=y
+CONFIG_HS20=y
# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-#CONFIG_SQLITE=y
+CONFIG_SQLITE=y
++++++ hostapd.service ++++++
[Unit]
Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
After=network.target
[Service]
ExecStart=/usr/sbin/hostapd /etc/hostapd.conf
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xmlbeans for openSUSE:Factory checked in at 2014-09-01 08:15:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlbeans (Old)
and /work/SRC/openSUSE:Factory/.xmlbeans.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlbeans"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans.changes 2014-07-17 17:31:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans.changes 2014-09-01 08:15:02.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 29 12:32:21 UTC 2014 - coolo(a)suse.com
+
+- provide xmlbeans in xmlbeans-mini so it's a valid choice
+ during bootstrap
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlbeans-mini.spec ++++++
--- /var/tmp/diff_new_pack.6eDFNT/_old 2014-09-01 08:15:03.000000000 +0200
+++ /var/tmp/diff_new_pack.6eDFNT/_new 2014-09-01 08:15:03.000000000 +0200
@@ -43,7 +43,8 @@
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
-Conflicts: xmlbeans
+# we need this to fix requires of rhino and others
+Provides: xmlbeans
#!BuildIgnore: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
%else
++++++ xmlbeans.spec ++++++
--- /var/tmp/diff_new_pack.6eDFNT/_old 2014-09-01 08:15:03.000000000 +0200
+++ /var/tmp/diff_new_pack.6eDFNT/_new 2014-09-01 08:15:04.000000000 +0200
@@ -42,7 +42,8 @@
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: xml-commons-apis-bootstrap
BuildRequires: xml-commons-resolver-bootstrap
-Conflicts: xmlbeans
+# we need this to fix requires of rhino and others
+Provides: xmlbeans
#!BuildIgnore: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
%else
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libcacard for openSUSE:Factory checked in at 2014-09-01 07:59:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcacard (Old)
and /work/SRC/openSUSE:Factory/.libcacard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcacard"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_link
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
<link package="qemu" cicount="copy" />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-09-01 07:59:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Changes:
--------
New Changes file:
--- /dev/null 2014-07-24 01:57:42.080040256 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/libcacard.changes 2014-09-01 07:59:20.000000000 +0200
@@ -0,0 +1,1789 @@
+-------------------------------------------------------------------
+Fri Aug 22 10:37:23 UTC 2014 - agraf(a)suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber(a)suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Sort BuildRequires alphabetically to avoid changing back and forth
+- Sync'ed deletion of .a and .la to libcacard.spec.in
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:30 UTC 2014 - coolo(a)suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
+Thu Jul 31 12:59:39 UTC 2014 - dimstar(a)opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+ Follow the packaging guidelines.
+
+-------------------------------------------------------------------
+Fri Jul 25 14:44:43 UTC 2014 - afaerber(a)suse.de
+
+- Backported VNC fixes for openQA (bnc#888142):
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
+Wed Jul 23 12:36:37 UTC 2014 - afaerber(a)suse.de
+
+- Update to v2.1.0-rc3: http://wiki.qemu-project.org/ChangeLog/2.1
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-module-Simplify-module_load.patch
+ 0040-module-Don-t-complain-when-a-module.patch
+* Updated update_git.sh script accordingly
+
+-------------------------------------------------------------------
+Wed Jul 16 17:31:54 UTC 2014 - afaerber(a)suse.de
+
+- Update to v2.1.0-rc2: http://wiki.qemu-project.org/ChangeLog/2.1
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0041-tests-Fix-unterminated-string-outpu.patch
+ 0042-libqos-Fix-PC-PCI-endianness-glitch.patch
+ 0043-qtest-fix-vhost-user-test-compilati.patch
+* Updated update_git.sh accordingly
+* Extended update_git.sh to add generated patch names to change log
+
+-------------------------------------------------------------------
+Wed Jul 9 17:34:55 UTC 2014 - afaerber(a)suse.de
+
+- Update to v2.1.0-rc0: http://wiki.qemu-project.org/ChangeLog/2.1
+* xen_disk discard support now upstream
+ 0037-xen_disk-add-discard-support.patch dropped
+* PowerPC ELF v2 support now upstream
+ 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch dropped
+* Patches renamed during rebase:
+ 0015-linux-user-arm-no-tb_flush-on-reset.patch -> 0015-target-arm-linux-user-no-tb_flush-o.patch
+* Patches reordered due to rebase:
+ 0038-tests-Don-t-run-qom-test-twice.patch -> 0037-tests-Don-t-run-qom-test-twice.patch
+ 0041-qtest-Increase-socket-timeout.patch -> 0038-qtest-Increase-socket-timeout.patch
+ 0071-module-Simplify-module_load.patch -> 0039-module-Simplify-module_load.patch
+ 0072-module-Don-t-complain-when-a-module.patch -> 0040-module-Don-t-complain-when-a-module.patch
+* Patches automatically dropped on rebase:
+ 0039-qtest-Assure-that-init_socket-s-lis.patch
+ 0040-qtest-Add-error-reporting-to-socket.patch
+ 0042-qtest-Be-paranoid-about-accept-addr.patch
+ 0043-arm-translate.c-Fix-smlald-Instruct.patch
+ 0044-target-arm-A64-fix-unallocated-test.patch
+ 0046-vmstate-add-VMS_MUST_EXIST.patch
+ 0047-vmstate-add-VMSTATE_VALIDATE.patch
+ 0048-virtio-net-fix-buffer-overflow-on-i.patch
+ 0049-virtio-net-out-of-bounds-buffer-wri.patch
+ 0050-virtio-out-of-bounds-buffer-write-o.patch
+ 0051-ahci-fix-buffer-overrun-on-invalid-.patch
+ 0052-hpet-fix-buffer-overrun-on-invalid-.patch
+ 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
+ 0054-pl022-fix-buffer-overun-on-invalid-.patch
+ 0055-vmstate-fix-buffer-overflow-in-targ.patch
+ 0056-virtio-avoid-buffer-overrun-on-inco.patch
+ 0057-virtio-validate-num_sg-when-mapping.patch
+ 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
+ 0059-ssd0323-fix-buffer-overun-on-invali.patch
+ 0060-tsc210x-fix-buffer-overrun-on-inval.patch
+ 0061-zaurus-fix-buffer-overrun-on-invali.patch
+ 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
+ 0063-vmstate-s-VMSTATE_INT32_LE-VMSTATE_.patch
+ 0064-usb-sanity-check-setup_index-setup_.patch
+ 0065-savevm-Ignore-minimum_version_id_ol.patch
+ 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
+ 0067-openpic-avoid-buffer-overrun-on-inc.patch
+ 0068-virtio-net-out-of-bounds-buffer-wri.patch
+ 0069-virtio-validate-config_len-on-load.patch
+ 0070-virtio-allow-mapping-up-to-max-queu.patch
+* iPXE fixes now included
+ ipxe-build-Work-around-bug-in-gcc-4.8.patch dropped
+ ipxe-build-Avoid-strict-aliasing-warning.patch dropped
+ ipxe-zbin-Fix-size-used-for-memset-in-al.patch dropped
+* SeaVGABIOS fix now included
+ vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch dropped
+* Modified update_git.sh accordingly
+
+- Update to v2.1.0-rc1: http://wiki.qemu-project.org/ChangeLog/2.1
+* 0041-tests-Fix-unterminated-string-outpu.patch: Test fix
+* 0042-libqos-Fix-PC-PCI-endianness-glitch.patch: Test fix for ppc
+* 0043-qtest-fix-vhost-user-test-compilati.patch: Test fix for SP3
+* Modified update_git.sh accordingly
+
+-------------------------------------------------------------------
+Wed Jun 23 21:42:31 UTC 2014 - afaerber(a)suse.de
+
+- Move block-curl.so to new qemu-block-curl package, avoiding a
+ dependency of qemu-tools on qemu for Xen (bnc#882008)
+* Avoid the reported error message about missing modules
+ 0071-module-Simplify-module_load.patch
+ 0072-module-Don-t-complain-when-a-module.patch
+- Improve update_git.sh performance (backport from SLE12)
+
+-------------------------------------------------------------------
+Mon Jun 2 13:26:13 UTC 2014 - brogers(a)suse.com
+
+- only build the x86 firmware on x86, ensuring consistent binaries
+- remove un-needed pmtools BuildRequires
+- Fix vga related problem doing direct kernel boot for SLES 10 and
+ SLES 11 guests (bnc#880625)
+ vgabios-Make-sure-stdvga_list_modes-doesn-t-overrun-.patch
+- Probe vhost-net module on SLE11 (copied from SP3 package)
+
+-------------------------------------------------------------------
+Sat May 24 10:01:36 UTC 2014 - afaerber(a)suse.de
+
+- Fix CVE-2013-4148 (bnc#864812)
+ 0048-virtio-net-fix-buffer-overflow-on-i.patch
+- Fix CVE-2013-4149 (bnc#864649)
+ 0068-virtio-net-out-of-bounds-buffer-wri.patch
+- Fix CVE-2013-4150 (bnc#864650)
+ 0049-virtio-net-out-of-bounds-buffer-wri.patch
+- Fix CVE-2013-4151 (bnc#864653)
+ 0050-virtio-out-of-bounds-buffer-write-o.patch
+- Fix CVE-2013-4526 (bnc#864671)
+ 0051-ahci-fix-buffer-overrun-on-invalid-.patch
+- Fix CVE-2013-4527 (bnc#864673)
+ 0052-hpet-fix-buffer-overrun-on-invalid-.patch
+- Fix CVE-2013-4529 (bnc#864678)
+ 0053-hw-pci-pcie_aer.c-fix-buffer-overru.patch
+- Fix CVE-2013-4530 (bnc#864682)
+ 0054-pl022-fix-buffer-overun-on-invalid-.patch
+- Fix CVE-2013-4531 (bnc#864796)
+ 0055-vmstate-fix-buffer-overflow-in-targ.patch
+- Fix CVE-2013-4533 (bnc#864655)
+ 0058-pxa2xx-avoid-buffer-overrun-on-inco.patch
+- Fix CVE-2013-4534 (bnc#864811)
+ 0067-openpic-avoid-buffer-overrun-on-inc.patch
+- Fix CVE-2013-4535 / CVE-2013-4536 (bnc#864665)
+ 0057-virtio-validate-num_sg-when-mapping.patch
+- Fix CVE-2013-4537 (bnc#864391)
+ 0066-ssi-sd-fix-buffer-overrun-on-invali.patch
+- Fix CVE-2013-4538 (bnc#864769)
+ 0059-ssd0323-fix-buffer-overun-on-invali.patch
+- Fix CVE-2013-4539 (bnc#864805)
+ 0060-tsc210x-fix-buffer-overrun-on-inval.patch
+- Fix CVE-2013-4540 (bnc#864801)
+ 0061-zaurus-fix-buffer-overrun-on-invali.patch
+- Fix CVE-2013-4541 (bnc#864802)
+ 0064-usb-sanity-check-setup_index-setup_.patch
+- Fix CVE-2013-4542 (bnc#864804)
+ 0062-virtio-scsi-fix-buffer-overrun-on-i.patch
+- Fix CVE-2013-6399 (bnc#864814)
+ 0067-virtio-avoid-buffer-overrun-on-inco.patch
+- Fix CVE-2014-0182 (bnc#874788)
+ 0069-virtio-validate-config_len-on-load.patch
+- Backported patch from stable branch (brogers):
+ 0070-virtio-allow-mapping-up-to-max-queu.patch
+
+-------------------------------------------------------------------
+Wed May 14 13:44:38 UTC 2014 - afaerber(a)suse.de
+
+- Fix conflict with libcacard 0.1.2 from project security
+* Adopt description and group for libcacard-devel from there
+- Drop libcacard.{a,la} from libcacard-devel
+ If needed, libcacard.a should go into a libcacard-devel-static.
+- Change qemu-extra to explicitly list qemu-system-* binaries
+
++++ 1592 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.qemu.new/libcacard.changes
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2014-08-03 15:36:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2014-09-01 07:59:23.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Aug 22 10:37:03 UTC 2014 - agraf(a)suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+- Implement missing ioctl to fix parted properly
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber(a)suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:09 UTC 2014 - coolo(a)suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-08-03 15:36:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-09-01 07:59:23.000000000 +0200
@@ -1,0 +2,29 @@
+Fri Aug 22 10:37:00 UTC 2014 - agraf(a)suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches added:
+ 0039-linux-user-Cast-validity-checks-on-.patch
+ 0040-linux-user-Convert-blkpg-to-use-a-s.patch
+
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber(a)suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
+-------------------------------------------------------------------
+Thu Aug 7 11:12:48 UTC 2014 - coolo(a)suse.com
+
+- build libcaca from a different spec file to avoid cycles with
+ spice
+
+-------------------------------------------------------------------
+Wed Aug 6 17:29:30 UTC 2014 - coolo(a)suse.com
+
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+* Patches dropped:
+ 0039-fix-full-frame-updates-for-VNC-clie.patch
+ 0040-vnc-update-fix.patch
+
+-------------------------------------------------------------------
Old:
----
0039-fix-full-frame-updates-for-VNC-clie.patch
0040-vnc-update-fix.patch
qemu-2.1.0-rc3.tar.bz2
New:
----
0039-linux-user-Cast-validity-checks-on-.patch
0040-linux-user-Convert-blkpg-to-use-a-s.patch
libcacard.changes
libcacard.spec
libcacard.spec.in
qemu-2.1.0.tar.bz2
qemu-2.1.0.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcacard.spec ++++++
#
# spec file for package libcacard
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libcacard
Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.1.0
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch
Patch0004: 0004-qemu-cvs-alsa_bitfield.patch
Patch0005: 0005-qemu-cvs-alsa_ioctl.patch
Patch0006: 0006-qemu-cvs-alsa_mmap.patch
Patch0007: 0007-qemu-cvs-gettimeofday.patch
Patch0008: 0008-qemu-cvs-ioctl_debug.patch
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
Patch0015: 0015-target-arm-linux-user-no-tb_flush-o.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
Patch0019: 0019-linux-user-lock-tb-flushing-too.patch
Patch0020: 0020-linux-user-Fake-proc-cpuinfo.patch
Patch0021: 0021-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0022: 0022-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0023: 0023-linux-user-XXX-disable-fiemap.patch
Patch0024: 0024-slirp-nooutgoing.patch
Patch0025: 0025-vnc-password-file-and-incoming-conn.patch
Patch0026: 0026-linux-user-add-more-blk-ioctls.patch
Patch0027: 0027-linux-user-use-target_ulong.patch
Patch0028: 0028-block-Add-support-for-DictZip-enabl.patch
Patch0029: 0029-block-Add-tar-container-format.patch
Patch0030: 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0032: 0032-console-add-question-mark-escape-op.patch
Patch0033: 0033-Make-char-muxer-more-robust-wrt-sma.patch
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
%description
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains statically linked binaries for running linux-user
emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-%{version}
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
%patch0011 -p1
%patch0012 -p1
%patch0013 -p1
%patch0014 -p1
%patch0015 -p1
%patch0016 -p1
%patch0017 -p1
%patch0018 -p1
%patch0019 -p1
%patch0020 -p1
%patch0021 -p1
%patch0022 -p1
%patch0023 -p1
%patch0024 -p1
%patch0025 -p1
%patch0026 -p1
%patch0027 -p1
%patch0028 -p1
%patch0029 -p1
%patch0030 -p1
%patch0031 -p1
%patch0032 -p1
%patch0033 -p1
%patch0034 -p1
%patch0035 -p1
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
--libexecdir=%_libexecdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -21,9 +21,9 @@
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
-Version: 2.0.93
+Version: 2.1.0
Release: 0
-Source: qemu-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -63,8 +63,8 @@
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
-Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
-Patch0040: 0040-vnc-update-fix.patch
+Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
+Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -117,7 +117,7 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.1.0-rc3
+%setup -q -n qemu-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -43,9 +43,10 @@
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
-Version: 2.0.93
+Version: 2.1.0
Release: 0
-Source: %name-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
+Source99: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -92,8 +93,8 @@
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
-Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
-Patch0040: 0040-vnc-update-fix.patch
+Patch0039: 0039-linux-user-Cast-validity-checks-on-.patch
+Patch0040: 0040-linux-user-Convert-blkpg-to-use-a-s.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
@@ -370,36 +371,6 @@
This sub-package contains various tools, including a bridge helper.
-%package -n libcacard0
-Summary: Common Access Card (CAC) emulation
-Group: System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary: Common Access Card (CAC) emulation -- Development files
-Group: Development/Languages/C and C++
-Requires: glib2-devel
-Requires: libcacard0 = %version
-Requires: mozilla-nspr
-Requires: mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@@ -487,7 +458,7 @@
%endif
%prep
-%setup -q -n %name-2.1.0-rc3
+%setup -q -n %name-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -610,8 +581,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
+rm $RPM_BUILD_ROOT/%_libdir/libcacard*
+rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
+rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@@ -643,9 +615,6 @@
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@@ -669,10 +638,6 @@
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
-%post -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@@ -871,17 +836,6 @@
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
++++++ 0001-XXX-dont-dump-core-on-sigabort.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9d12fa380ea51761fa5ebbbdc0d0f35857386b1f Mon Sep 17 00:00:00 2001
+From cd92cadeac41448d9da05993dc36837fb18774d0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort
++++++ 0002-XXX-work-around-SA_RESTART-race-wit.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 22405b72847554fc6b6bdbd638c268ace80d7ce6 Mon Sep 17 00:00:00 2001
+From 251831808a392ee0c9dbe4fc0930c8a776a00eb0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Thu, 1 Dec 2011 19:00:01 +0100
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
++++++ 0003-qemu-0.9.0.cvs-binfmt.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 1e506ce87e3b551204e7c8556744cf8cfa92cb85 Mon Sep 17 00:00:00 2001
+From 9def5a721b4ba27bff7ae6acebf01a1e12a2d5d3 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli(a)suse.de>
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH] qemu-0.9.0.cvs-binfmt
++++++ 0004-qemu-cvs-alsa_bitfield.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a04ffd68a5b5b199ea541c9da5fc3859d93c3818 Mon Sep 17 00:00:00 2001
+From c82f7e1ea51d8b07c0b4d3b911dde45bcbd02560 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH] qemu-cvs-alsa_bitfield
++++++ 0005-qemu-cvs-alsa_ioctl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a378ff5370f6042713599a80a9abf60911c3b663 Mon Sep 17 00:00:00 2001
+From a3e7d59e61520032f4426310195915e71622631c Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 14 Apr 2009 16:23:27 +0200
Subject: [PATCH] qemu-cvs-alsa_ioctl
++++++ 0006-qemu-cvs-alsa_mmap.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9054622c8f9f227773bc32403859e0072a1630a1 Mon Sep 17 00:00:00 2001
+From 7d78b3ff3cca24f85abe0ae6f7889d802d8a4cd0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH] qemu-cvs-alsa_mmap
++++++ 0007-qemu-cvs-gettimeofday.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6433c7791241a69fb875e9612f8ebd181ad1b2a8 Mon Sep 17 00:00:00 2001
+From 5b7a59579eb7851d28eae98a3b621fc06ff2e091 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli(a)suse.de>
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday
++++++ 0008-qemu-cvs-ioctl_debug.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2cfde90a43d75901198213a1620c44b62b915a48 Mon Sep 17 00:00:00 2001
+From 0cfec315dbe8f6c8350315c22ddc83f705b65407 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug
++++++ 0009-qemu-cvs-ioctl_nodirection.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5d65a63a5305e42187bb61595bd34ce67916e00b Mon Sep 17 00:00:00 2001
+From 7e3bec5f8e91e36623521aef6a2952d1a0079c3f Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection
++++++ 0010-block-vmdk-Support-creation-of-SCSI.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From a11d2097bce7374843220a31c94186a73b1aa969 Mon Sep 17 00:00:00 2001
+From b990b06fedf9acb38da0e8a5921b203e1572859e Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli(a)suse.de>
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
++++++ 0011-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 7e3816a7a96dc7fa2f699b1929a027f9587b110d Mon Sep 17 00:00:00 2001
+From fe047f7a640629933a20b35c742172d60b198738 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
++++++ 0012-PPC-KVM-Disable-mmu-notifier-check.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 62b7da9ebf01803de3768e425ec4742269c0e0ee Mon Sep 17 00:00:00 2001
+From 00558f88ef659515a59debcbd19e304d8a884a5f Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check
++++++ 0013-linux-user-fix-segfault-deadlock.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d4fd71138a97db96f423d44144633637f62f298a Mon Sep 17 00:00:00 2001
+From 222ee94ba6e46ef89a6cc0de6f03b25310af02a7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock
++++++ 0014-linux-user-binfmt-support-host-bina.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2dba4056236a9f41b0de729713ba11f9a428d26c Mon Sep 17 00:00:00 2001
+From 5d5c84486c1a16916376b8d0b757eab4a2c45ddd Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries
@@ -8,11 +8,11 @@
Signed-off-by: Alexander Graf <agraf(a)suse.de>
---
- linux-user/binfmt.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
+ linux-user/binfmt.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
-index cd1f513..87dc4c6 100644
+index cd1f513..c755edc 100644
--- a/linux-user/binfmt.c
+++ b/linux-user/binfmt.c
@@ -5,6 +5,9 @@
@@ -25,7 +25,7 @@
int main(int argc, char **argv, char **envp)
{
-@@ -28,6 +31,28 @@ int main(int argc, char **argv, char **envp)
+@@ -28,6 +31,29 @@ int main(int argc, char **argv, char **envp)
binfmt[0] = '\0';
/* Now argv[0] is the real qemu binary name */
@@ -33,14 +33,15 @@
+ {
+ char *hostbin;
+ char *guestarch;
++ int r;
+
+ guestarch = strrchr(argv[0], '-') ;
+ if (!guestarch) {
+ goto skip;
+ }
+ guestarch++;
-+ asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
-+ if (!access(hostbin, X_OK)) {
++ r = asprintf(&hostbin, "/emul/" ARCH_NAME "-for-%s/%s", guestarch, argv[1]);
++ if (!access(hostbin, X_OK) && (r > 0)) {
+ /*
+ * We found a host binary replacement for the non-host binary. Let's
+ * use that instead!
++++++ 0015-target-arm-linux-user-no-tb_flush-o.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 56191c08ebab2895ce7362517901ddbdceff3e78 Mon Sep 17 00:00:00 2001
+From cbdee3c89ee3a9eb92e4950331a4467ef3b631f7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 29 May 2012 15:30:01 +0200
Subject: [PATCH] target-arm: linux-user: no tb_flush on reset
++++++ 0016-linux-user-Ignore-broken-loop-ioctl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From dfb36bf2a5654aed53311fe79be72f236bd5e821 Mon Sep 17 00:00:00 2001
+From 01b4a4a0570ebb8808233a33fb1e19b247e1bef5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 12 Jun 2012 04:41:10 +0200
Subject: [PATCH] linux-user: Ignore broken loop ioctl
++++++ 0017-linux-user-lock-tcg.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 3c7976dbd6b551d7c0c503f54f6056515159d48d Mon Sep 17 00:00:00 2001
+From 097619e159ed8c4c0209aacf93e9a3a64f853aef Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Thu, 5 Jul 2012 17:31:39 +0200
Subject: [PATCH] linux-user: lock tcg
++++++ 0018-linux-user-Run-multi-threaded-code-.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6e6f95d867e2722f952fe4b7cd4e6fcdc5e2f3cf Mon Sep 17 00:00:00 2001
+From d708c8ddc376dab7cf20421553d2f066ff0e4c67 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 10 Jul 2012 20:40:55 +0200
Subject: [PATCH] linux-user: Run multi-threaded code on a single core
++++++ 0019-linux-user-lock-tb-flushing-too.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From cbbf0779a6cf50f973982760792f357b77d91835 Mon Sep 17 00:00:00 2001
+From 5c92fd785687b31d2af90d9a67dfac7763f58ed0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 11 Jul 2012 16:47:42 +0200
Subject: [PATCH] linux-user: lock tb flushing too
++++++ 0020-linux-user-Fake-proc-cpuinfo.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 0ce92834dd3a55e232de8097245f5e51f03af497 Mon Sep 17 00:00:00 2001
+From 99d290456ff1103918e341ceac7535bc3b4b6f49 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo
++++++ 0021-linux-user-implement-FS_IOC_GETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From ec0dc12708f5cd1a1880ebe165c8e4b2a0876d86 Mon Sep 17 00:00:00 2001
+From cc0c9cec3fd3bcf86f7ddca8d6ba6a292c127cef Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 20 Aug 2012 00:02:52 +0200
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl
++++++ 0022-linux-user-implement-FS_IOC_SETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 549adde44ee4762253aab35c4b72bf3fb9b9eb94 Mon Sep 17 00:00:00 2001
+From e822cfa8fea3cddc331664ce2e7df20ed630d37b Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 20 Aug 2012 00:07:13 +0200
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl
++++++ 0023-linux-user-XXX-disable-fiemap.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6d699789b883d02ca2b5cf762a1a496cb1d294fa Mon Sep 17 00:00:00 2001
+From 691935bb8dcfdbb9c64af96d8ba7421000b7d648 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 21 Aug 2012 14:20:40 +0200
Subject: [PATCH] linux-user: XXX disable fiemap
++++++ 0024-slirp-nooutgoing.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 2386ed38a5203b175f5d225d7693f9f3019b1b2f Mon Sep 17 00:00:00 2001
+From c4a739a0fdfae2c61b78ccfc3893298dc79e4f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber(a)suse.de>
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
@@ -12,7 +12,7 @@
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
-index 9e54686..0a7247d 100644
+index 1549625..c0f9022 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2795,6 +2795,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
++++++ 0025-vnc-password-file-and-incoming-conn.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 568c674a7dcedee67b067a79ca4a680dd5d8dffd Mon Sep 17 00:00:00 2001
+From d9fd5bb9acd60d2dd7f46eecf49899ae196bb199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber(a)suse.de>
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=
@@ -9,7 +9,7 @@
1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
-index 548588a..ab03ee3 100644
+index f8d9b7d..48e6591 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -47,6 +47,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@@ -20,7 +20,7 @@
static int vnc_cursor_define(VncState *vs);
static void vnc_release_modifiers(VncState *vs);
-@@ -1037,6 +1038,7 @@ static void vnc_disconnect_start(VncState *vs)
+@@ -1039,6 +1040,7 @@ static void vnc_disconnect_start(VncState *vs)
void vnc_disconnect_finish(VncState *vs)
{
int i;
@@ -28,7 +28,7 @@
vnc_jobs_join(vs); /* Wait encoding jobs */
-@@ -1085,6 +1087,13 @@ void vnc_disconnect_finish(VncState *vs)
+@@ -1087,6 +1089,13 @@ void vnc_disconnect_finish(VncState *vs)
}
g_free(vs->lossy_rect);
g_free(vs);
@@ -42,7 +42,7 @@
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3036,6 +3045,39 @@ char *vnc_display_local_addr(DisplayState *ds)
+@@ -3039,6 +3048,39 @@ char *vnc_display_local_addr(DisplayState *ds)
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@@ -82,7 +82,7 @@
void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
{
VncDisplay *vs = vnc_display;
-@@ -3069,6 +3111,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3072,6 +3114,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
@@ -92,7 +92,7 @@
if (fips_get_state()) {
error_setg(errp,
"VNC password auth disabled due to FIPS mode, "
-@@ -3077,6 +3122,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3080,6 +3125,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
goto fail;
}
password = 1; /* Require password auth */
++++++ 0026-linux-user-add-more-blk-ioctls.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9c4aad2cda60ee3d0ca7a4fabdf3decc3392b2ae Mon Sep 17 00:00:00 2001
+From 45ebd4980cc8f842caa9d4e68ced2b4f134caaac Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls
++++++ 0027-linux-user-use-target_ulong.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5710d6cf91f323779e6f80432b5e383eb3bb96f0 Mon Sep 17 00:00:00 2001
+From 1529d998a6e9858db8548628d16cff3ddbe2a080 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong
++++++ 0028-block-Add-support-for-DictZip-enabl.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 3b259aafe15356db62e11ffd28bb49e608fc9f25 Mon Sep 17 00:00:00 2001
+From 0a3476a6138ce132a75f84c994c1b6ffdcc87354 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 5 Aug 2009 09:49:37 +0200
Subject: [PATCH] block: Add support for DictZip enabled gzip files
++++++ 0029-block-Add-tar-container-format.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 7ae392839701cf9de9d232b030de5de78b399b11 Mon Sep 17 00:00:00 2001
+From 0fdc9a7f05acb99c3c21f747a4d25419f03c80dd Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 5 Aug 2009 17:28:38 +0200
Subject: [PATCH] block: Add tar container format
++++++ 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d73a78b03f5a2ecdd9324691f54802988c448eb2 Mon Sep 17 00:00:00 2001
+From eee446e6a362ab72bc97c90225ba6123f6d0ab3c Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 12 Dec 2012 19:11:30 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
++++++ 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 066ff7b47f0d6ed60c5cc2314a6cdb3b46e701fe Mon Sep 17 00:00:00 2001
+From c20addda112a82af598960724a0968904c1735fb Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Wed, 12 Dec 2012 19:11:31 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
++++++ 0032-console-add-question-mark-escape-op.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From d50517d9fe72cbd9e9a26615c0ef288763003be4 Mon Sep 17 00:00:00 2001
+From e54695d614849c8760f8ccb0ed467a74fca7f741 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 6 Jun 2011 06:53:52 +0200
Subject: [PATCH] console: add question-mark escape operator
++++++ 0033-Make-char-muxer-more-robust-wrt-sma.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 4f764327a74213eb54b0a9fe7019644df95a6d5a Mon Sep 17 00:00:00 2001
+From fae838b94d08af3b2230d2cafcacbc3d2ac780e5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Thu, 1 Apr 2010 17:36:23 +0200
Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@@ -22,7 +22,7 @@
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
-index 7acc03f..c0ab288 100644
+index 956be49..d578c23 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -311,6 +311,9 @@ typedef struct {
++++++ 0034-linux-user-lseek-explicitly-cast-no.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 9de42598d5f5117d1fb2a13f36da01e946b0f43f Mon Sep 17 00:00:00 2001
+From cc47aef37004096cfe5788ce51d930543f614bbf Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
++++++ 0035-virtfs-proxy-helper-Provide-__u64-f.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 393ae753b3a72824994b6e58e38437b41baa56c7 Mon Sep 17 00:00:00 2001
+From ce5ea9682c42819ea21be30172208718ad890969 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers(a)suse.com>
Date: Thu, 16 May 2013 12:39:10 +0200
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
++++++ 0036-configure-Enable-PIE-for-ppc-and-pp.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 5d53831a6dd2c69e284319860212fb6f3bf7af15 Mon Sep 17 00:00:00 2001
+From 2ad523fe3a4a65ef306e1f4ebbcd8d23bab9f75e Mon Sep 17 00:00:00 2001
From: Dinar Valeev <k0da(a)opensuse.org>
Date: Wed, 2 Oct 2013 17:56:03 +0200
Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
++++++ 0037-tests-Don-t-run-qom-test-twice.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 6bcc0297f33189667a882fa2db3a7c7f064fe52b Mon Sep 17 00:00:00 2001
+From 3d053835529bbdbdc9e05f9f4d6d6de87238f4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber(a)suse.de>
Date: Mon, 7 Apr 2014 16:03:08 +0200
Subject: [PATCH] tests: Don't run qom-test twice
++++++ 0038-qtest-Increase-socket-timeout.patch ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-From 0cf035b2443562953c3e731b9feed4365553d1f2 Mon Sep 17 00:00:00 2001
+From d3c34d8f618b8914920e0f7d3979912c335f5fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber(a)suse.de>
Date: Thu, 17 Apr 2014 18:39:10 +0200
Subject: [PATCH] qtest: Increase socket timeout
++++++ 0039-linux-user-Cast-validity-checks-on-.patch ++++++
>From d9fc1799803a3783e0f764b0c9b7a336c8d3b893 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Fri, 22 Aug 2014 11:28:52 +0200
Subject: [PATCH] linux-user: Cast validity checks on g_posix_timers range
We check whether the passed in counter value is negative on all calls
that involve g_posix_timers. However, we also check check for negativity
of that value after casting it - at which point it couldn't possibly be
negative anymore.
Cast the check to int16_t. Maybe this is correct. Maybe the check should
get removed completely.
Signed-off-by: Alexander Graf <agraf(a)suse.de>
---
linux-user/syscall.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0b4668d..660095b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9602,7 +9602,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
/* args: timer_t timerid, int flags, const struct itimerspec *new_value,
* struct itimerspec * old_value */
arg1 &= 0xffff;
- if (arg3 == 0 || arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if (arg3 == 0 || (int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9624,7 +9624,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
arg1 &= 0xffff;
if (!arg2) {
return -TARGET_EFAULT;
- } else if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ } else if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9644,7 +9644,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
{
/* args: timer_t timerid */
arg1 &= 0xffff;
- if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
@@ -9659,7 +9659,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
{
/* args: timer_t timerid */
arg1 &= 0xffff;
- if (arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
+ if ((int16_t)arg1 < 0 || arg1 >= ARRAY_SIZE(g_posix_timers)) {
ret = -TARGET_EINVAL;
} else {
timer_t htimer = g_posix_timers[arg1];
++++++ 0040-linux-user-Convert-blkpg-to-use-a-s.patch ++++++
>From 4b0131e7b071bb06802a99fcf9a3717215b2362b Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Fri, 22 Aug 2014 12:22:28 +0200
Subject: [PATCH] linux-user: Convert blkpg to use a special subop handler
The blkpg ioctl can take different payloads depending on the opcode in
its payload structure. Create a new special ioctl handler that can only
deal with partition style ones for now.
Signed-off-by: Alexander Graf <agraf(a)suse.de>
---
Andreas, if you like feel free to squash this into your patch and submit
it upstream.
---
linux-user/ioctls.h | 3 ++-
linux-user/syscall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
linux-user/syscall_types.h | 2 +-
3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 9b6cacb..8eb4446 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -96,7 +96,8 @@
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKSSZGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKBSZGET, IOC_R, MK_PTR(TYPE_INT))
- IOCTL(BLKPG, IOC_W, MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
+ IOCTL_SPECIAL(BLKPG, IOC_W, do_ioctl_blkpg,
+ MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
#ifdef FIBMAP
IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 660095b..04b5119 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3657,6 +3657,59 @@ out:
return ret;
}
+static abi_long do_ioctl_blkpg(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
+ abi_long cmd, abi_long arg)
+{
+ void *argptr;
+ int target_size;
+ const argtype *arg_type = ie->arg_type;
+ const argtype part_arg_type[] = { MK_STRUCT(STRUCT_blkpg_partition) };
+ abi_long ret;
+
+ struct blkpg_ioctl_arg *host_blkpg = (void*)buf_temp;
+ struct blkpg_partition host_part;
+
+ /* Read and convert blkpg */
+ arg_type++;
+ target_size = thunk_type_size(arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg, target_size, 1);
+ if (!argptr) {
+ ret = -TARGET_EFAULT;
+ goto out;
+ }
+ thunk_convert(buf_temp, argptr, arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
+
+ switch (host_blkpg->op) {
+ case BLKPG_ADD_PARTITION:
+ case BLKPG_DEL_PARTITION:
+ /* payload is struct blkpg_partition */
+ break;
+ default:
+ /* Unknown opcode */
+ ret = -TARGET_EINVAL;
+ goto out;
+ }
+
+ /* Read and convert blkpg->data */
+ arg = (abi_long)(uintptr_t)host_blkpg->data;
+ target_size = thunk_type_size(part_arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg, target_size, 1);
+ if (!argptr) {
+ ret = -TARGET_EFAULT;
+ goto out;
+ }
+ thunk_convert(&host_part, argptr, part_arg_type, THUNK_HOST);
+ unlock_user(argptr, arg, 0);
+
+ /* Swizzle the data pointer to our local copy and call! */
+ host_blkpg->data = &host_part;
+ ret = get_errno(ioctl(fd, ie->host_cmd, host_blkpg));
+
+out:
+ return ret;
+}
+
static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
int fd, abi_long cmd, abi_long arg)
{
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 56e344c..a730c87 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -260,4 +260,4 @@ STRUCT(blkpg_ioctl_arg,
TYPE_INT, /* op */
TYPE_INT, /* flags */
TYPE_INT, /* datalen */
- MK_PTR(MK_STRUCT(STRUCT_blkpg_partition))) /* data */
+ TYPE_PTRVOID) /* data */
++++++ libcacard.spec.in ++++++
#
# spec file for package libcacard
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libcacard
Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
%description
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains statically linked binaries for running linux-user
emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-%{version}
PATCH_EXEC
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
--libexecdir=%_libexecdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog
++++++ qemu-2.1.0-rc3.tar.bz2 -> qemu-2.1.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/qemu/qemu-2.1.0-rc3.tar.bz2 /work/SRC/openSUSE:Factory/.qemu.new/qemu-2.1.0.tar.bz2 differ: char 11, line 1
++++++ qemu-linux-user.spec.in ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: qemu-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
@@ -78,7 +78,7 @@
run cross-architecture builds.
%prep
-%setup -q -n qemu-2.1.0-rc3
+%setup -q -n qemu-2.1.0
PATCH_EXEC
%build
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -45,7 +45,8 @@
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: %name-2.1.0-rc3.tar.bz2
+Source: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
+Source99: http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -331,36 +332,6 @@
This sub-package contains various tools, including a bridge helper.
-%package -n libcacard0
-Summary: Common Access Card (CAC) emulation
-Group: System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary: Common Access Card (CAC) emulation -- Development files
-Group: Development/Languages/C and C++
-Requires: glib2-devel
-Requires: libcacard0 = %version
-Requires: mozilla-nspr
-Requires: mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@@ -448,7 +419,7 @@
%endif
%prep
-%setup -q -n %name-2.1.0-rc3
+%setup -q -n %name-2.1.0
PATCH_EXEC
%if %{build_x86_fw_from_source}
@@ -532,8 +503,9 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
+rm $RPM_BUILD_ROOT/%_libdir/libcacard*
+rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
+rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@@ -565,9 +537,6 @@
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@@ -591,10 +560,6 @@
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
-%post -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@@ -793,17 +758,6 @@
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.XU1VSg/_old 2014-09-01 07:59:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XU1VSg/_new 2014-09-01 07:59:25.000000000 +0200
@@ -12,7 +12,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.1
-GIT_UPSTREAM_TAG=v2.1.0-rc3
+GIT_UPSTREAM_TAG=v2.1.0
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@@ -87,7 +87,7 @@
echo " ${i##*/}" >> qemu.changes.added
done
- for package in qemu qemu-linux-user; do
+ for package in qemu qemu-linux-user libcacard; do
while IFS= read -r line; do
if [ "$line" = "PATCH_FILES" ]; then
for i in 0???-*.patch; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package qdox for openSUSE:Factory checked in at 2014-09-01 07:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qdox (Old)
and /work/SRC/openSUSE:Factory/.qdox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qdox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qdox/qdox.changes 2014-08-14 14:57:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qdox.new/qdox.changes 2014-09-01 07:59:01.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 28 08:39:19 UTC 2014 - coolo(a)suse.com
+
+- rename the conditional to junit_test and switch the default,
+ bootstrapping factory is more important than a single test
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qdox.spec ++++++
--- /var/tmp/diff_new_pack.kvsvBW/_old 2014-09-01 07:59:02.000000000 +0200
+++ /var/tmp/diff_new_pack.kvsvBW/_new 2014-09-01 07:59:02.000000000 +0200
@@ -17,7 +17,7 @@
%bcond_with maven
-%bcond_with java_bootstrap
+%bcond_with junit_test
# If you want repolib package to be built,
# issue the following: 'rpmbuild --with repolib'
%define _with_repolib 1
@@ -62,14 +62,14 @@
BuildRequires: ant >= 1.6
#BuildRequires: ant-junit >= 1.6
BuildRequires: byaccj
-%if %{with java_bootstrap}
-BuildRequires: java-cup-bootstrap
-BuildRequires: jflex-bootstrap
-%else
+%if %{with junit_test}
BuildRequires: java-cup
BuildRequires: jflex
BuildRequires: jmock
BuildRequires: junit >= 3.8.1
+%else
+BuildRequires: java-cup-bootstrap
+BuildRequires: jflex-bootstrap
%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -165,7 +165,7 @@
../src/grammar/parser.y
popd
mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
-%if %{with java_bootstrap}
+%if ! %{with junit_test}
rm -f src/java/com/thoughtworks/qdox/junit/APITestCase.java
%endif
ant -Dbuild.sysclasspath=only jar javadoc
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
01 Sep '14
Hello community,
here is the log from the commit of package java-1_7_0-openjdk-bootstrap for openSUSE:Factory checked in at 2014-09-01 07:58:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk-bootstrap (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk-bootstrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk-bootstrap"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.sAYHtj/_old 2014-09-01 07:58:28.000000000 +0200
+++ /var/tmp/diff_new_pack.sAYHtj/_new 2014-09-01 07:58:28.000000000 +0200
@@ -1 +1,5 @@
-<link package="java-1_7_0-openjdk" cicount="copy" />
+<link package="java-1_7_0-openjdk" cicount="copy">
+<patches>
+ <topadd>%global _with_bootstrap 1</topadd>
+</patches>
+</link>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0