Mailinglist Archive: opensuse-commit (1248 mails)

< Previous Next >
commit trustedgrub for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 16 Apr 2010 01:43:32 +0200
  • Message-id: <20100415234332.97777202A6@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package trustedgrub for openSUSE:Factory
checked in at Fri Apr 16 01:43:32 CEST 2010.



--------
--- trustedgrub/trustedgrub.changes 2009-11-15 17:00:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/trustedgrub/trustedgrub.changes
2010-04-14 13:12:33.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 13 16:11:36 CEST 2010 - duwe@xxxxxxx
+
+- really disable use of BSD-licensed code (bnc#427066)
+- fix minor triviality bnc#542463
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ trustedgrub.spec ++++++
--- /var/tmp/diff_new_pack.8seNRc/_old 2010-04-16 01:43:03.000000000 +0200
+++ /var/tmp/diff_new_pack.8seNRc/_new 2010-04-16 01:43:03.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package trustedgrub (Version 1.1.3)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -17,16 +17,15 @@

# norootforbuild

-# Commandline:

Name: trustedgrub
%ifarch x86_64
BuildRequires: gcc-32bit glibc-devel-32bit libncurses5-32bit
ncurses-devel-32bit
%endif
-License: GPL v2 or later
+License: GPLv2+
Group: System/Boot
Version: 1.1.3
-Release: 10
+Release: 11
Source0: TrustedGRUB-%{version}.tgz
Source2: grubonce
Source3: grub-install
@@ -150,6 +149,8 @@
# grub-terminfo is irrelevant to us
rm -f $RPM_BUILD_ROOT/usr/sbin/grub-terminfo
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/grub-terminfo*
+# Files contining BSD-licensed code that might get linked with GPL'ed one.
+rm -f $RPM_BUILD_ROOT/usr/lib/grub/{ufs2,ffs}_stage1_5

%clean
rm -rf $RPM_BUILD_ROOT;

++++++ trustedgrub-compile-fixes ++++++
--- /var/tmp/diff_new_pack.8seNRc/_old 2010-04-16 01:43:03.000000000 +0200
+++ /var/tmp/diff_new_pack.8seNRc/_new 2010-04-16 01:43:03.000000000 +0200
@@ -46,3 +46,41 @@
}

void tcg_hash_extend_pcr (void)
+--- TrustedGRUB-1.1.3/stage2/Makefile.am.orig 2010-04-13 16:17:55.000000000
+0200
++++ TrustedGRUB-1.1.3/stage2/Makefile.am 2010-04-14 12:51:19.000000000
+0200
+@@ -21,9 +21,9 @@ libgrub_a_SOURCES = boot.c builtins.c ch
+ fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c sha1.c stage2.c \
+ terminfo.c tparm.c
+ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+- -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1
-DFSYS_ISO9660=1 \
++ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 \
+ -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_NTFS=1 \
+- -DFSYS_REISERFS=1 -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
++ -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \
+ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+
+ # Stage 2 and Stage 1.5's.
+--- TrustedGRUB-1.1.3/util/sha1.c.orig 2007-11-11 21:14:28.000000000 +0100
++++ TrustedGRUB-1.1.3/util/sha1.c 2010-04-14 12:54:24.000000000 +0200
+@@ -387,7 +387,6 @@ int calculate_sha1(char* filename, t_U32
+ int round = 1;
+ struct stat attribute;
+ char *tcgbuffer;
+- tcgbuffer = (char*) malloc(TCG_BUFFER_SIZE);
+
+ #ifdef DEBUG
+ printf("Calculating SHA1 for file: %s\n",filename);
+--- TrustedGRUB-1.1.3/grub/Makefile.am.orig 2007-05-09 13:53:22.000000000
+0200
++++ TrustedGRUB-1.1.3/grub/Makefile.am 2010-04-14 13:00:26.000000000 +0200
+@@ -6,9 +6,9 @@ else
+ SERIAL_FLAGS = -DSUPPORT_SERIAL=1
+ endif
+
+-AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_NTFS=1
-DFSYS_FFS=1 \
++AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_NTFS=1 \
+ -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
+- -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
++ -DFSYS_VSTAFS=1 \
+ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_HERCULES=1 \
+ $(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
+ -I$(top_srcdir)/stage1 -I$(top_srcdir)/lib


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages