From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 26 Aug 2010 12:49:09 +0000 (+0000)
Subject: Merged revisions 283629 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2413
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9d1879ceae13e5cea06689a7c9e3e823f51a64;p=thirdparty%2Fasterisk.git

Merged revisions 283629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283629 | russell | 2010-08-26 07:48:45 -0500 (Thu, 26 Aug 2010) | 2 lines

  Remove public keys that are no longer useful.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 30df890ca4..d0f02a3d85 100644
--- a/Makefile
+++ b/Makefile
@@ -606,8 +606,6 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL)
 
 	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
 	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
diff --git a/keys/freeworlddialup.pub b/keys/freeworlddialup.pub
deleted file mode 100644
index 4ba3faf665..0000000000
--- a/keys/freeworlddialup.pub
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcE53oHNoe3sBSkvW3JaO8v5Z1
-CC+Cm+JgocGwmUek0hlQST1NUsFWfYIMd5z/Iunnd1GziXLqDYzCQeZUtJ6Y9J4A
-cA9wNv1eYWrlH7ozKWOv592+Y5xF0kqQ1jFt+5zFTP5myL9N439Evu/BWALHw0B4
-aML+CsGHg0uIe5ZjNwIDAQAB
------END PUBLIC KEY-----
diff --git a/keys/iaxtel.pub b/keys/iaxtel.pub
deleted file mode 100644
index d7c8f6cc8d..0000000000
--- a/keys/iaxtel.pub
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3+joshldCUFgjj5DeYOgRLSPS
-0t7gxTHiy1BTfynadPzgn447dy9iIQfBykE0pEdIPgaPMEt+ZPqPtln1P4dX3Ynx
-I+RYKgtjsmYYnyJRMGHfHuLXwkbFkxyiEg0KDvbdBWbz7GUNZlp49BLXewWGY9DJ
-MauE7FXVyCVDchn0YQIDAQAB
------END PUBLIC KEY-----