Move more packages to separate files

4 files changed, 0 insertions, 120 deletions

diff --git a/patches/muttprint_0.73-4.diff.gz b/patches/muttprint_0.73-4.diff.gz
deleted file mode 100644
index c4f3cef..0000000
--- a/patches/muttprint_0.73-4.diff.gz
+++ /dev/null
diff --git a/patches/muttprint_regex.patch b/patches/muttprint_regex.patch
deleted file mode 100644
index e99c4a2..0000000
--- a/patches/muttprint_regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/muttprint 2015-07-21 11:18:04.219578426 +1200
-+++ b/muttprint 2015-07-21 11:18:53.906243779 +1200
-@@ -1635,7 +1635,7 @@
-        open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!";
-        
-        while (<AUX>) {
--               ($numberOfPages) = /\\newlabel{LastPage}{{}{(\d+)}}/;
-+               ($numberOfPages) = /\\newlabel\{LastPage}\{\{}\{(\d+)}}/;
-        }
-        
-        close AUX or fatalError "Could not close $auxfile:\n$!";
diff --git a/patches/muttprint_two_edge.patch b/patches/muttprint_two_edge.patch
deleted file mode 100644
index 4a7290d..0000000
--- a/patches/muttprint_two_edge.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/muttprint 2016-05-05 13:48:50.515950744 +1200
-+++ b/muttprint 2016-05-05 13:52:10.722623902 +1200
-@@ -643,14 +643,14 @@
-        if ($Config{PAPERSAVE} eq "on") {
-                if ($useCups) {
-                        $Config{PRINT_COMMAND} =~ 
--                               s/\$CUPS_OPTIONS/ -o sides=two-sided-long-edge \$CUPS_OPTIONS/;
-+                               s/\$CUPS_OPTIONS/ -o sides=two-sided-short-edge \$CUPS_OPTIONS/;
-                } else { # no cups
-                        modifyPS("landscape");
-                }
-        } else { # no papersave
-                if ($useCups) {
-                        $Config{PRINT_COMMAND} =~ 
--                               s/\$CUPS_OPTIONS/ -o sides=two-sided-short-edge \$CUPS_OPTIONS/;
-+                               s/\$CUPS_OPTIONS/ -o sides=two-sided-long-edge \$CUPS_OPTIONS/;
-                } else { # no cups
-                        modifyPS("portrait");
-                }
diff --git a/patches/telegram-cli.patch b/patches/telegram-cli.patch
deleted file mode 100644
index 2d2b7b0..0000000
--- a/patches/telegram-cli.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c
-index db653f2..5e6a697 100644
---- a/tgl/crypto/rsa_pem_openssl.c
-+++ b/tgl/crypto/rsa_pem_openssl.c
-@@ -36,6 +36,12 @@ TGLC_WRAPPER_ASSOC(rsa,RSA)
- // TODO: Refactor crucial struct-identity into its own header.
- TGLC_WRAPPER_ASSOC(bn,BIGNUM)
- 
-+/*
-+ * Since OpenSSL version 1.1.0 the RSA struct (rsa_st) is opaque,
-+ * see also https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
-+ */
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+
- TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
-   RSA *ret = RSA_new ();
-   ret->e = unwrap_bn (TGLC_bn_new ());
-@@ -47,7 +53,30 @@ TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
- #define RSA_GETTER(M)                                                          \
-   TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) {                                    \
-     return wrap_bn (unwrap_rsa (key)->M);                                      \
--  }                                                                            \
-+  }
-+
-+#else // OPENSSL_VERSION_NUMBER
-+
-+TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
-+  RSA *ret = RSA_new ();
-+  BIGNUM *ret_e = unwrap_bn (TGLC_bn_new ());
-+  BIGNUM *ret_n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL));
-+  RSA_set0_key (ret, ret_n, ret_e, NULL);
-+  TGLC_bn_set_word (wrap_bn (ret_e), e);
-+  return wrap_rsa (ret);
-+}
-+
-+#define RSA_GETTER(M)                       \
-+TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) {   \
-+    BIGNUM *rsa_n, *rsa_e, *rsa_d;          \
-+    RSA_get0_key(unwrap_rsa (key),          \
-+        (const BIGNUM **) &rsa_n,           \
-+        (const BIGNUM **) &rsa_e,           \
-+        (const BIGNUM **) &rsa_d);          \
-+    return wrap_bn (rsa_ ## M);             \
-+}
-+
-+#endif // OPENSSL_VERSION_NUMBER
- 
- RSA_GETTER(n);
- RSA_GETTER(e);
-@@ -60,4 +89,4 @@ TGLC_rsa *TGLC_pem_read_RSAPublicKey (FILE *fp) {
-   return wrap_rsa (PEM_read_RSAPublicKey (fp, NULL, NULL, NULL));
- }
- 
--#endif
-+#endif // TGL_AVOID_OPENSSL
-diff --git a/tgl/mtproto-utils.c b/tgl/mtproto-utils.c
-index 0948bc8..cfdb216 100644
---- a/tgl/mtproto-utils.c
-+++ b/tgl/mtproto-utils.c
-@@ -98,7 +98,7 @@ static unsigned long long BN2ull (TGLC_bn *b) {
-   if (sizeof (unsigned long) == 8) {
-     return TGLC_bn_get_word (b);
-   } else if (sizeof (unsigned long long) == 8) {
--    assert (0); // As long as nobody ever uses this code, assume it is broken.
-+//    assert (0); // As long as nobody ever uses this code, assume it is broken.
-     unsigned long long tmp;
-     /* Here be dragons, but it should be okay due to be64toh */
-     TGLC_bn_bn2bin (b, (unsigned char *) &tmp);
-@@ -112,7 +112,7 @@ static void ull2BN (TGLC_bn *b, unsigned long long val) {
-   if (sizeof (unsigned long) == 8 || val < (1ll << 32)) {
-     TGLC_bn_set_word (b, val);
-   } else if (sizeof (unsigned long long) == 8) {
--    assert (0); // As long as nobody ever uses this code, assume it is broken.
-+//    assert (0); // As long as nobody ever uses this code, assume it is broken.
-     htobe64(val);
-     /* Here be dragons, but it should be okay due to htobe64 */
-     TGLC_bn_bin2bn ((unsigned char *) &val, 8, b);
-diff --git a/tgl/tl-parser/tl-parser.c b/tgl/tl-parser/tl-parser.c
-index 524b196..aeadbd2 100644
---- a/tgl/tl-parser/tl-parser.c
-+++ b/tgl/tl-parser/tl-parser.c
-@@ -1903,7 +1903,7 @@ struct tl_combinator_tree *tl_parse_args134 (struct tree *T) {
-       //assert (S->data);
-       char *name = S->data;
-       if (!name) {
--        static char s[20];
-+        static char s[21];
-         sprintf (s, "%lld", lrand48 () * (1ll << 32) + lrand48 ());
-         name = s;
-       }