Accepting request 205376 from home:k0da:ppc

- make sure WORDS_BIGENDIAN is defined correctly where needed
  (bigendian.patch) - fixes checkmedia on bigedian platform

OBS-URL: https://build.opensuse.org/request/show/205376
OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=17
This commit is contained in:
Steffen Winterfeldt 2013-11-05 12:53:26 +00:00 committed by Git OBS Bridge
parent cd1a266147
commit 2545cc69ae
3 changed files with 88 additions and 4 deletions

77
bigendian.patch Normal file
View File

@ -0,0 +1,77 @@
Index: checkmedia-3.0/md5.c
===================================================================
--- checkmedia-3.0.orig/md5.c
+++ checkmedia-3.0/md5.c
@@ -33,11 +33,12 @@
# include "unlocked-io.h"
#endif
-#ifdef _LIBC
# include <endian.h>
# if __BYTE_ORDER == __BIG_ENDIAN
# define WORDS_BIGENDIAN 1
# endif
+
+#ifdef _LIBC
/* We need to keep the namespace clean so define the MD5 function
protected using leading __ . */
# define md5_init_ctx __md5_init_ctx
Index: checkmedia-3.0/sha1.c
===================================================================
--- checkmedia-3.0.orig/sha1.c
+++ checkmedia-3.0/sha1.c
@@ -34,6 +34,11 @@
# include "unlocked-io.h"
#endif
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define WORDS_BIGENDIAN 1
+# endif
+
#ifdef WORDS_BIGENDIAN
# define SWAP(n) (n)
#else
Index: checkmedia-3.0/sha256.c
===================================================================
--- checkmedia-3.0.orig/sha256.c
+++ checkmedia-3.0/sha256.c
@@ -30,6 +30,11 @@
# include "unlocked-io.h"
#endif
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define WORDS_BIGENDIAN 1
+# endif
+
#ifdef WORDS_BIGENDIAN
# define SWAP(n) (n)
#else
Index: checkmedia-3.0/sha512.c
===================================================================
--- checkmedia-3.0.orig/sha512.c
+++ checkmedia-3.0/sha512.c
@@ -20,8 +20,6 @@
Scott G. Miller's sha1.c
*/
-#include "sha512.h"
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -30,6 +28,13 @@
# include "unlocked-io.h"
#endif
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define WORDS_BIGENDIAN 1
+# endif
+
+#include "sha512.h"
+
#ifdef WORDS_BIGENDIAN
# define SWAP(n) (n)
#else

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 31 15:28:26 UTC 2013 - dvaleev@suse.com
- make sure WORDS_BIGENDIAN is defined correctly where needed
(bigendian.patch) - fixes checkmedia on bigedian platform
-------------------------------------------------------------------
Wed Jan 25 11:13:55 CET 2012 - snwint@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package checkmedia
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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
@ -16,14 +16,14 @@
#
Name: checkmedia
Summary: Check Installation Media
License: GPL-3.0+
Group: System/Management
Summary: Check Installation Media
Version: 3.0
Release: 1
Release: 0
Source: %{name}-%{version}.tar.bz2
Patch0: bigendian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -31,6 +31,7 @@ Checks installation CDs and DVDs for errors.
%prep
%setup
%patch0 -p1
%build
make %{?_smp_mflags}