update upstream url, fix compile error with inlines

add support for aarch64

3 files changed, 112 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 32dc15166275..e9fb91c832d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,28 +6,38 @@ pkgrel=5
 pkgdesc="Mgetty is a versatile program to handle all aspects of a modem under Unix."
 url="http://mgetty.greenie.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64')
 depends=('glibc' 'logrotate' 'udev' 'netpbm')
 makedepends=('make')
 install=mgetty.install
-source=(http://fossies.org/unix/misc/$pkgname$pkgver-Jun05.tar.gz
+source=(ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${pkgname}${pkgver}-Jun05.tar.gz
 	    Makefile.patch
 	    config.patch
 	    policy.patch
+            no-inline.patch
+            aarch64.patch
 	    90-mgetty.rules
-        mgetty@.service)
+            mgetty@.service)
 md5sums=('4df2eb47bd6d5318d3d642572ab56e51'
          'eaa2b17d77ca099ebb7e92cf2006f6c1'
          'd40de3f241a2851f091e0046cb7f28c0'
          '5556e5e88c784e75acb14ab998d7eb1a'
+         '4291e988c7e15c1e93ac86b6efe5818b'
+         '8756ace492fb86ba70ed3a5c4b980b0b'
          '4b73a5654db86a34a8dccdf5f55c699c'
          'cbc70329924235e8f2e6302c859d59a6')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   cp policy.h-dist policy.h
   patch -Np0 -i ../../config.patch
   patch -Np0 -i ../../policy.patch
+  patch -p1 < ../../no-inline.patch
+  patch -p1 < ../../aarch64.patch
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
   make
 }
 
@@ -36,6 +46,8 @@ package() {
   mkdir -p $pkgdir/var/spool
   make prefix=$pkgdir/usr spool=$pkgdir/var/spool CONFDIR=$pkgdir/etc/mgetty+sendfax FAX_OUT_USER=0 install
   rm -f $pkgdir/usr/bin/g3topbm
+  mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/
+  rm -r $pkgdir/usr/sbin
   install -D -m644 $srcdir/90-mgetty.rules $pkgdir/etc/udev/rules.d/90-mgetty.rules
   install -D -m644 $srcdir/mgetty@.service $pkgdir/usr/lib/systemd/system/mgetty@.service
 }
diff --git a/aarch64.patch b/aarch64.patch
new file mode 100644
index 000000000000..9d3b9cbc9633
--- /dev/null
+++ b/aarch64.patch
@@ -0,0 +1,11 @@
+diff -U3 -r a/mgetty.h b/mgetty.h
+--- a/mgetty.h	2006-01-01 12:13:18.000000000 -0500
++++ b/mgetty.h	2018-01-13 12:53:00.337516215 -0500
+@@ -198,7 +198,7 @@
+  */
+ #if defined(__alpha__) || defined(__sparc64__) || \
+ 	    defined(__ia64__) || defined(__s390x__) || defined(__x86_64__) || \
+-	    defined(__powerpc64__)
++	    defined(__powerpc64__) || defined(__aarch64__)
+ # define PTR_IS_LONG
+ #endif
diff --git a/no-inline.patch b/no-inline.patch
new file mode 100644
index 000000000000..1d8384e7a838
--- /dev/null
+++ b/no-inline.patch
@@ -0,0 +1,85 @@
+diff -U3 -r a/g3/g3cat.c b/g3/g3cat.c
+--- a/g3/g3cat.c	2005-02-27 14:03:37.000000000 -0500
++++ b/g3/g3cat.c	2018-01-13 22:38:01.598767655 -0500
+@@ -43,9 +43,6 @@
+ static int b_written = 0;		/* bytes of a line already */
+ 					/* written */
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+ #ifdef DEBUG
+@@ -66,9 +63,6 @@
+     }
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putwhitespan _P1( (l), int l )
+ {
+     if ( l >= 64 )
+@@ -97,9 +91,6 @@
+     putcode( t_white[l].bit_code, t_white[l].bit_length );
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putblackspan _P1( (l), int l )
+ {
+     if ( l >= 64 )
+@@ -128,9 +119,6 @@
+     putcode( t_black[l].bit_code, t_black[l].bit_length );
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+     static int last_buflen = 0;
+diff -U3 -r a/g3/pbm2g3.c b/g3/pbm2g3.c
+--- a/g3/pbm2g3.c	1998-05-07 07:32:04.000000000 -0400
++++ b/g3/pbm2g3.c	2018-01-13 22:38:11.742884611 -0500
+@@ -39,9 +39,6 @@
+ 
+ static int out_byte_tab[ 256 ];			/* for g3 byte reversal */
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+     out_data |= ( code << out_hibit );
+@@ -59,18 +56,12 @@
+     }
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+     if ( byte_align ) while( out_hibit != 4 ) putcode( 0, 1 );
+     putcode( 0x800, 12 );
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putwhitespan _P1( (l), int l )
+ {
+     if ( l >= 64 )
+@@ -99,9 +90,6 @@
+     putcode( t_white[l].bit_code, t_white[l].bit_length );
+ }
+ 
+-#ifdef __GNUC__
+-inline
+-#endif
+ void putblackspan _P1( (l), int l )
+ {
+     if ( l >= 64 )