Attachment 875105 Details for Bug 1076903 – Use system gsm instead of bundled one

[patch] Use system gsm instead of bundled one

Use-system-gsm-instead-of-bundled-one.patch (text/plain), 4.88 KB, created by Ville Skyttä on 2014-03-16 11:35:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-16 11:35:59 UTC

Size: 4.88 KB

patch

obsolete

>From e47eecbacfe7b466d0b3288e67f1101254314f66 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sun, 16 Mar 2014 13:35:04 +0200
>Subject: [PATCH] Use system gsm instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1076903
>---
> mgetty-1.1.36-system-gsm.patch | 53 ++++++++++++++++++++++++++++++++++++++++++
> mgetty.spec                    | 10 ++++++--
> 2 files changed, 61 insertions(+), 2 deletions(-)
> create mode 100644 mgetty-1.1.36-system-gsm.patch
>
>diff --git a/mgetty-1.1.36-system-gsm.patch b/mgetty-1.1.36-system-gsm.patch
>new file mode 100644
>index 0000000..bb6ad56
>--- /dev/null
>+++ b/mgetty-1.1.36-system-gsm.patch
>@@ -0,0 +1,53 @@
>+diff -up mgetty-1.1.36/voice/libpvf/depend~ mgetty-1.1.36/voice/libpvf/depend
>+--- mgetty-1.1.36/voice/libpvf/depend~	1998-09-09 22:18:34.000000000 +0300
>++++ mgetty-1.1.36/voice/libpvf/depend	2014-03-16 13:33:12.685957165 +0200
>+@@ -47,7 +47,7 @@ usr.o: usr.c ../include/voice.h ../inclu
>+  ../include/../../fax_lib.h ../include/IS_101.h ../include/bitsizes.h \
>+  ../include/util.h ../include/config.h ../include/default.h \
>+  ../include/event.h ../include/hardware.h ../include/header.h \
>+- ../include/paths.h ../include/pvf.h ../include/wav.h ../libmgsm/gsm.h
>++ ../include/paths.h ../include/pvf.h ../include/wav.h
>+ voc.o: voc.c ../include/voice.h ../include/../../mgetty.h \
>+  ../include/../../ugly.h ../include/../../config.h \
>+  ../include/../../policy.h ../include/../../tio.h \
>+diff -up mgetty-1.1.36/voice/libpvf/usr.c~ mgetty-1.1.36/voice/libpvf/usr.c
>+--- mgetty-1.1.36/voice/libpvf/usr.c~	2001-12-23 00:52:29.000000000 +0200
>++++ mgetty-1.1.36/voice/libpvf/usr.c	2014-03-16 13:27:57.027201497 +0200
>+@@ -43,7 +43,7 @@ int usrtopvf (FILE *fd_in, FILE *fd_out,
>+ /*****************
>+  ** GSM SECTION **
>+  *****************/
>+-#include "../libmgsm/gsm.h"
>++#include <gsm.h>
>+ 
>+ /* USR's GSM data format consists of 38-byte frames of data where the
>+  * first two bytes of the frame (usually "0xFE 0xFE" for valid data and
>+diff -up mgetty-1.1.36/voice/.makefile~ mgetty-1.1.36/voice/.makefile
>+--- mgetty-1.1.36/voice/.makefile~	1998-09-09 22:16:41.000000000 +0300
>++++ mgetty-1.1.36/voice/.makefile	2014-03-16 13:32:52.366522304 +0200
>+@@ -45,7 +45,7 @@ include/version.h:
>+ depend: include/version.h
>+ 	@echo "Creating depend files..."
>+ 	@touch depend
>+-	@for i in libpvf libutil libvoice libmgsm pvftools vgetty vm ;\
>++	@for i in libpvf libutil libvoice pvftools vgetty vm ;\
>+ 	do \
>+ 		echo $$i"/depend" ;\
>+ 		cd $$i ;\
>+diff -up mgetty-1.1.36/voice/Makefile~ mgetty-1.1.36/voice/Makefile
>+--- mgetty-1.1.36/voice/Makefile~	2006-09-26 18:38:17.000000000 +0300
>++++ mgetty-1.1.36/voice/Makefile	2014-03-16 13:16:36.535642870 +0200
>+@@ -18,11 +18,11 @@ MGETTYLIB=../../getdisk.o ../../goodies.
>+ 	../../locks.o ../../tio.o ../../modem.o \
>+ 	../../class1.o ../../class1lib.o ../../hyla_nsf.o 
>+ 
>+-LIBDIRS=libpvf libutil libvoice libmgsm
>++LIBDIRS=libpvf libutil libvoice
>+ LIBPVF=../libpvf/libpvf.a
>+ LIBUTIL=../libutil/libutil.a
>+ LIBVOICE=../libvoice/libvoice.a
>+-LIBGSM=../libmgsm/libmgsm.a
>++LIBGSM=-lgsm
>+ 
>+ PROGRAMDIRS=pvftools vgetty vm
>+ 
>diff --git a/mgetty.spec b/mgetty.spec
>index c642754..1bf88a8 100644
>--- a/mgetty.spec
>+++ b/mgetty.spec
>@@ -9,7 +9,7 @@
> Summary: A getty replacement for use with data and fax modems
> Name: mgetty
> Version: 1.1.36
>-Release: 24%{?dist}
>+Release: 25%{?dist}
> Source: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
> Source1: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
> Source2: logrotate.mgetty
>@@ -21,6 +21,7 @@ Source7: mgetty@.service
> 
> Patch0: mgetty-1.1.29-config.patch
> Patch1: mgetty-1.1.26-policy.patch
>+Patch2: mgetty-1.1.36-system-gsm.patch
> Patch4: mgetty-1.1.25-voiceconfig.patch
> Patch5: mgetty-1.1.26-issue.patch
> Patch6: mgetty-1.1.31-issue-doc.patch
>@@ -50,7 +51,7 @@ Patch28: mgetty-1.1.36-hardening.patch
> 
> License: GPLv2+
> Group: Applications/Communications
>-BuildRequires: libX11-devel, libXext-devel, texinfo-tex, texlive-dvips, lockdev-devel, systemd
>+BuildRequires: libX11-devel, libXext-devel, texinfo-tex, texlive-dvips, lockdev-devel, systemd, gsm-devel
> Requires: coreutils, /usr/sbin/sendmail, uucp
> Requires(post): /sbin/install-info, systemd
> Requires(preun): /sbin/install-info, systemd
>@@ -116,6 +117,8 @@ Viewfax is capable of zooming in and out on the displayed fax.
> mv policy.h-dist policy.h
> %patch0 -p1 -b .config
> %patch1 -p1 -b .policy
>+%patch2 -p1 -b .system-gsm
>+rm -r voice/libmgsm
> %patch4 -p1 -b .voiceconfig
> %patch5 -p1 -b .issue
> %patch6 -p1 -b .issue-doc
>@@ -366,6 +369,9 @@ fi
> %{_mandir}/man1/viewfax.1*
> 
> %changelog
>+* Sun Mar 16 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.1.36-25
>+- Use system gsm instead of bundled one
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.36-24
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1076903: 875105