[gitg/f15/master] update to 0.2.2
by Tomas Bzatek
commit 4b4f9eea5ca7e30d66d8765b687c4f4fc43b719b
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Fri Apr 1 12:08:08 2011 +0200
update to 0.2.2
.gitignore | 1 +
gitg.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec64dd9..0262ec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gitg-0.0.6.tar.bz2
/gitg-0.2.0.tar.bz2
+/gitg-0.2.2.tar.bz2
diff --git a/gitg.spec b/gitg.spec
index 79392dd..8f2549c 100644
--- a/gitg.spec
+++ b/gitg.spec
@@ -1,5 +1,5 @@
Name: gitg
-Version: 0.2.0
+Version: 0.2.2
Release: 1%{?dist}
Summary: GTK+ graphical interface for the git revision control system
@@ -121,6 +121,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_includedir}/libgitg-1.0
%changelog
+* Fri Apr 01 2011 Ignacio Casal Quinteiro <icq(a)gnome.org> - 0.2.2-1
+- update to 0.2.2
+
* Tue Feb 08 2011 Ignacio Casal Quinteiro <icq(a)gnome.org> - 0.2.0-1
- update to 0.2.0
diff --git a/sources b/sources
index b0b6016..d90cd1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d2b78d7686a84b52d7316c5eedf3ba1 gitg-0.2.0.tar.bz2
+4707d5e898b248c52cc1f8582a0ad494 gitg-0.2.2.tar.bz2
11Â years, 1Â month
[openssh] resolve warnings in port_linux.c
by Jan F. Chadima
commit 7f6509f657bf4d8481b1af1b0ae4669d5d2b8e46
Author: Jan F <jfch(a)kerberos.example.com>
Date: Fri Apr 1 12:02:44 2011 +0200
resolve warnings in port_linux.c
openssh-5.8p1-sftpcontext.patch | 90 +++++---------------------------------
1 files changed, 12 insertions(+), 78 deletions(-)
---
diff --git a/openssh-5.8p1-sftpcontext.patch b/openssh-5.8p1-sftpcontext.patch
index 3571b43..569f361 100644
--- a/openssh-5.8p1-sftpcontext.patch
+++ b/openssh-5.8p1-sftpcontext.patch
@@ -1,53 +1,18 @@
diff -up openssh-5.8p1/session.c.sftpcontext openssh-5.8p1/session.c
---- openssh-5.8p1/session.c.sftpcontext 2011-03-17 06:20:41.651773603 +0100
-+++ openssh-5.8p1/session.c 2011-03-17 06:39:11.947648737 +0100
-@@ -1479,12 +1479,21 @@ safely_chroot(const char *path, uid_t ui
-
- /* Set login name, uid, gid, and groups. */
- void
-+#ifdef WITH_SELINUX
-+do_setusercontext(struct passwd *pw, const char *context)
-+#else
- do_setusercontext(struct passwd *pw)
-+#endif
- {
- char *chroot_path, *tmp;
-
- platform_setusercontext(pw);
-
+--- openssh-5.8p1/session.c.sftpcontext 2011-04-01 11:22:26.988648474 +0200
++++ openssh-5.8p1/session.c 2011-04-01 11:31:49.127665411 +0200
+@@ -831,6 +831,10 @@ do_exec(Session *s, const char *command)
+ if (s->command != NULL)
+ s->command_handle = PRIVSEP(audit_run_command(s->command));
+ #endif
+#ifdef WITH_SELINUX
-+ if (context)
-+ ssh_selinux_change_context(context);
++debug(">>> %d:%d %s ~ %d", getuid(), geteuid(), s->command, IS_INTERNAL_SFTP(s->command));
++// ssh_selinux_change_context("sftpd_t");
+#endif
-+
- if (platform_privileged_uidswap()) {
- #ifdef HAVE_LOGIN_CAP
- if (setusercontext(lc, pw, pw->pw_uid,
-@@ -1633,7 +1642,11 @@ do_child(Session *s, const char *command
-
- /* Force a password change */
- if (s->authctxt->force_pwchange) {
-+#ifdef WITH_SELINUX
-+ do_setusercontext(pw, NULL); //should be passwd_t context set here?
-+#else
- do_setusercontext(pw);
-+#endif
- child_close_fds();
- do_pwchange(s);
- exit(1);
-@@ -1660,7 +1673,11 @@ do_child(Session *s, const char *command
- /* When PAM is enabled we rely on it to do the nologin check */
- if (!options.use_pam)
- do_nologin(pw);
-+#ifdef WITH_SELINUX
-+ do_setusercontext(pw, s->is_subsystem == SUBSYSTEM_INT_SFTP ? "sftpd_t" : NULL);
-+#else
- do_setusercontext(pw);
-+#endif
- /*
- * PAM session modules in do_setusercontext may have
- * generated messages, so if this in an interactive
-@@ -1780,9 +1797,6 @@ do_child(Session *s, const char *command
+ if (s->ttyfd != -1)
+ ret = do_exec_pty(s, command);
+ else
+@@ -1780,9 +1784,6 @@ do_child(Session *s, const char *command
argv[i] = NULL;
optind = optreset = 1;
__progname = argv[0];
@@ -57,34 +22,3 @@ diff -up openssh-5.8p1/session.c.sftpcontext openssh-5.8p1/session.c
exit(sftp_server_main(i, argv, s->pw));
}
-diff -up openssh-5.8p1/session.h.sftpcontext openssh-5.8p1/session.h
---- openssh-5.8p1/session.h.sftpcontext 2011-03-17 06:38:15.287648531 +0100
-+++ openssh-5.8p1/session.h 2011-03-17 06:40:25.907648653 +0100
-@@ -84,7 +84,11 @@ Session *session_new(void);
- Session *session_by_id(int);
- Session *session_by_tty(char *);
- void session_close(Session *);
-+#ifdef WITH_SELINUX
-+void do_setusercontext(struct passwd *, const char *);
-+#else
- void do_setusercontext(struct passwd *);
-+#endif
- void child_set_env(char ***envp, u_int *envsizep, const char *name,
- const char *value);
-
-diff -up openssh-5.8p1/sshd.c.sftpcontext openssh-5.8p1/sshd.c
---- openssh-5.8p1/sshd.c.sftpcontext 2011-03-17 06:40:55.961663207 +0100
-+++ openssh-5.8p1/sshd.c 2011-03-17 06:45:14.037735849 +0100
-@@ -772,7 +772,11 @@ privsep_postauth(Authctxt *authctxt)
- RAND_seed(rnd, sizeof(rnd));
-
- /* Drop privileges */
-- do_setusercontext(authctxt->pw);
-+#ifdef WITH_SELINUX
-+ do_setusercontext(authctxt->pw, NULL);
-+#else
-+ do_setusercontext(authctxt->pw);
-+#endif
-
- skip:
- /* It is safe now to apply the key state */
11Â years, 1Â month
[shotwell] Rebase upstream's multilib patch to apply to 0.9.0 final (the original patch is in a context where a
by Michel Alexandre Salim
commit c47bd38104d7acb1c57eb660022d9876fae4fc17
Author: Michel Alexandre Salim <michel(a)sylvestre.me>
Date: Fri Apr 1 11:55:30 2011 +0200
Rebase upstream's multilib patch to apply to 0.9.0 final (the original patch
is in a context where an unrelated line has been updated)
shotwell-0.9.0-multilib.patch | 77 +++++++++++++---------------------------
1 files changed, 25 insertions(+), 52 deletions(-)
---
diff --git a/shotwell-0.9.0-multilib.patch b/shotwell-0.9.0-multilib.patch
index ff6873d..7b10a2a 100644
--- a/shotwell-0.9.0-multilib.patch
+++ b/shotwell-0.9.0-multilib.patch
@@ -1,22 +1,16 @@
-From bec8dcaa01f71a44320c7437493e281d8d47bd2a Mon Sep 17 00:00:00 2001
-From: lucas <lucas@3d32681d-0f36-45c0-afa7-64c43348dfec>
-Date: Thu, 31 Mar 2011 21:17:50 +0000
-Subject: [PATCH] Allows configuring the name of the system library directory at build time. Closes #3421.
-
-git-svn-id: svn://svn.yorba.org/shotwell/trunk@2823 3d32681d-0f36-45c0-afa7-64c43348dfec
----
- Makefile | 7 ++++---
- configure | 12 +++++++++++-
- shotwell-plugin-dev-1.0.m4 | 2 +-
- src/AppDirs.vala | 2 +-
- src/Resources.vala | 5 ++++-
- 5 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9cab74f..c900420 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,19 +14,19 @@ INSTALL_DATA := install -m 644
+--- shotwell-0.9.0/shotwell-plugin-dev-1.0.m4.multilib 2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/shotwell-plugin-dev-1.0.m4 2011-04-01 11:50:56.914539923 +0200
+@@ -1,6 +1,6 @@
+ prefix=_PREFIX_
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/_LIB_
+ includedir=${prefix}/include
+
+ Name: Shotwell Plugin Development
+--- shotwell-0.9.0/Makefile.multilib 2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/Makefile 2011-04-01 11:54:19.668539920 +0200
+@@ -14,19 +14,19 @@
PREFIX=/usr/local
SCHEMA_FILE_DIR=/etc/gconf/schemas
BUILD_RELEASE=1
@@ -31,14 +25,14 @@ index 9cab74f..c900420 100644
EXPORT_FLAGS = -export-dynamic
- SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te ta
+ SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te_IN
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR=$(DESTDIR)$(PREFIX)/share/locale
-LIB=lib
include units.mk
include plugins/plugins.mk
-@@ -556,7 +556,8 @@ ifdef INSTALL_HEADERS
+@@ -557,7 +557,8 @@
endif
$(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
@@ -48,11 +42,9 @@ index 9cab74f..c900420 100644
$(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4
@mkdir -p $(UNITIZE_DIR)
-diff --git a/configure b/configure
-index 815cfad..a63259f 100755
---- a/configure
-+++ b/configure
-@@ -19,6 +19,8 @@ configure_help() {
+--- shotwell-0.9.0/configure.multilib 2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/configure 2011-04-01 11:50:56.911539923 +0200
+@@ -19,6 +19,8 @@
printf "\t\t\t\t[--release]\n"
printf "\t--prefix=PREFIX\t\tPrepend PREFIX to program installation paths.\n"
printf "\t\t\t\t[/usr/local]\n"
@@ -61,7 +53,7 @@ index 815cfad..a63259f 100755
printf "\t--define=SYMBOL\t\tDefine a symbol for the Vala compiler.\n"
printf "\t--with-gconf-schema-file-dir=DIR\n"
printf "\t\t\t\tDirectory for installing schema files.\n"
-@@ -65,7 +67,15 @@ do
+@@ -65,7 +67,15 @@
variables="${variables}PREFIX=$value\n"
;;
@@ -78,23 +70,9 @@ index 815cfad..a63259f 100755
--assume-pkgs) variables="${variables}ASSUME_PKGS=1\n"
;;
-diff --git a/shotwell-plugin-dev-1.0.m4 b/shotwell-plugin-dev-1.0.m4
-index 3a2fc94..1cbf175 100644
---- a/shotwell-plugin-dev-1.0.m4
-+++ b/shotwell-plugin-dev-1.0.m4
-@@ -1,6 +1,6 @@
- prefix=_PREFIX_
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/_LIB_
- includedir=${prefix}/include
-
- Name: Shotwell Plugin Development
-diff --git a/src/AppDirs.vala b/src/AppDirs.vala
-index e69238b..72f7a0e 100644
---- a/src/AppDirs.vala
-+++ b/src/AppDirs.vala
-@@ -153,7 +153,7 @@ class AppDirs {
+--- shotwell-0.9.0/src/AppDirs.vala.multilib 2011-03-22 21:46:15.000000000 +0100
++++ shotwell-0.9.0/src/AppDirs.vala 2011-04-01 11:50:56.915539923 +0200
+@@ -153,7 +153,7 @@
public static File get_lib_dir() {
File? install_dir = get_install_dir();
@@ -103,10 +81,8 @@ index e69238b..72f7a0e 100644
: get_exec_dir();
}
-diff --git a/src/Resources.vala b/src/Resources.vala
-index 9123d8c..a5f8e47 100644
---- a/src/Resources.vala
-+++ b/src/Resources.vala
+--- shotwell-0.9.0/src/Resources.vala.multilib 2011-03-22 21:46:15.000000000 +0100
++++ shotwell-0.9.0/src/Resources.vala 2011-04-01 11:50:56.916539923 +0200
@@ -8,6 +8,7 @@
extern const string _PREFIX;
extern const string _VERSION;
@@ -115,7 +91,7 @@ index 9123d8c..a5f8e47 100644
namespace Resources {
public const string APP_TITLE = "Shotwell";
-@@ -21,7 +22,9 @@ namespace Resources {
+@@ -21,7 +22,9 @@
public const string WIKI_URL = "http://trac.yorba.org/wiki/Shotwell";
public const string FAQ_URL = "http://trac.yorba.org/wiki/Shotwell/FAQ";
public const string DIR_PATTERN_URI_SYSWIDE = "ghelp:shotwell?other-files";
@@ -126,6 +102,3 @@ index 9123d8c..a5f8e47 100644
public const string PREFIX = _PREFIX;
public const double TRANSIENT_WINDOW_OPACITY = 0.90;
---
-1.7.4.2
-
11Â years, 1Â month
[ghc/f15/master] provides ghc-doc again; ghc-prof requires ghc-devel; ghc-devel requires ghc
by Jens Petersen
commit 2dedb984882abfbb426c405df1a4a31dece0a342
Author: Jens Petersen <petersen(a)redhat.com>
Date: Fri Apr 1 18:52:41 2011 +0900
provides ghc-doc again; ghc-prof requires ghc-devel; ghc-devel requires ghc
ghc.spec | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 33d3d88..bcd05b5 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -24,7 +24,7 @@
# ghc does not output dwarf format so debuginfo is not useful
%global debug_package %{nil}
-# for http://hackage.haskell.org/trac/ghc/ticket/5004
+# workaround http://hackage.haskell.org/trac/ghc/ticket/5004
# override /usr/lib/rpm/redhat/macros
%global __os_install_post \
/usr/lib/rpm/redhat/brp-compress \
@@ -47,7 +47,7 @@ Version: 7.0.2
# - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release)
# - minor release numbers should be incremented monotonically
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9
@@ -61,6 +61,8 @@ Source3: ghc-doc-index.cron
URL: http://haskell.org/ghc/
# introduced for f14
Obsoletes: ghc-doc < 6.12.3-4
+# BR for lib and binlib packages
+Provides: ghc-doc = %{version}-%{release}
# introduced for f15
Obsoletes: ghc-libs < 7.0.1-3
BuildRequires: ghc, ghc-rpm-macros >= 0.11.12
@@ -131,6 +133,7 @@ interface.
%package devel
Summary: GHC development libraries meta package
Group: Development/Libraries
+Requires: ghc = %{version}-%{release}
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2,/g")}
%description devel
@@ -140,6 +143,7 @@ This is a meta-package for all the development library packages in GHC.
%package prof
Summary: GHC profiling libraries meta-package
Group: Development/Libraries
+Requires: ghc-devel = %{version}-%{release}
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-prof = \2,/g")}
%description prof
@@ -370,6 +374,11 @@ fi
%endif
%changelog
+* Fri Apr 1 2011 Jens Petersen <petersen(a)redhat.com> - 7.0.2-16
+- provides ghc-doc again: it is still a buildrequires for libraries
+- ghc-prof now requires ghc-devel
+- ghc-devel now requires ghc explicitly
+
* Wed Mar 30 2011 Jens Petersen <petersen(a)redhat.com> - 7.0.2-15
- do not strip static libs since it breaks ghci-7.0.2 loading libHSghc.a
(see http://hackage.haskell.org/trac/ghc/ticket/5004)
11Â years, 1Â month
[libguestfs] Don't forget to update version number.
by Richard W.M. Jones
commit 7faa8b62afee9d0a79a12e3abcc0d7407449a8de
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 1 10:28:31 2011 +0100
Don't forget to update version number.
libguestfs.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 4da36c0..8d53042 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,7 +29,7 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
-Version: 1.9.14
+Version: 1.9.15
Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
11Â years, 1Â month
[libguestfs] New upstream version 1.9.15.
by Richard W.M. Jones
commit b0b425f2d8eb017164f5fe307e7427ac6644f73a
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 1 10:26:10 2011 +0100
New upstream version 1.9.15.
- Add BR libconfig-devel.
- Add /etc/libguestfs-tools.conf (config file for guestfish, guestmount,
virt-rescue; in future for other tools as well).
.gitignore | 1 +
libguestfs.spec | 8 ++++++++
sources | 2 +-
3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db02cec..1975c32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ libguestfs-1.5.3.tar.gz
/libguestfs-1.9.12.tar.gz
/libguestfs-1.9.13.tar.gz
/libguestfs-1.9.14.tar.gz
+/libguestfs-1.9.15.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 74d14ea..4da36c0 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -61,6 +61,7 @@ BuildRequires: po4a
BuildRequires: gperf
BuildRequires: db4-utils
BuildRequires: cpio
+BuildRequires: libconfig-devel
# This is only needed for RHEL 5 because readline-devel doesn't
# properly depend on it, but doesn't do any harm on other platforms:
@@ -665,6 +666,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/virt-ls.1*
%{_bindir}/virt-rescue
%{_mandir}/man1/virt-rescue.1*
+%config(noreplace) %{_sysconfdir}/libguestfs-tools.conf
%files tools
@@ -765,6 +767,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Apr 1 2011 Richard W.M. Jones <rjones(a)redhat.com> - 1:1.9.15-1
+- New upstream version 1.9.15.
+- Add BR libconfig-devel.
+- Add /etc/libguestfs-tools.conf (config file for guestfish, guestmount,
+ virt-rescue; in future for other tools as well).
+
* Mon Mar 28 2011 Richard W.M. Jones <rjones(a)redhat.com> - 1:1.9.14-1
- New upstream version 1.9.14.
- Include 'acl' as BR so virt-rescue gets getfacl and setfacl programs.
diff --git a/sources b/sources
index ce0d604..3d2fa6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-823be9caa5a605674b47c10cee9a1676 libguestfs-1.9.14.tar.gz
+2c77255f9878d5cd38df6140ce818247 libguestfs-1.9.15.tar.gz
11Â years, 1Â month