diff --git a/advisors/helper/version_exceptions.yaml b/advisors/helper/version_exceptions.yaml
index d8620df363573734d36804500b776faf1144812b..f45a719899d70f312be44eda4230303bb2b94cba 100644
--- a/advisors/helper/version_exceptions.yaml
+++ b/advisors/helper/version_exceptions.yaml
@@ -36,3 +36,5 @@ rabbitmq-server:
     - '6547461e6c2e'
 reflections:
     - '21959e6e'
+initial-setup:
+    - '1091470'
diff --git a/advisors/version_recommend.py b/advisors/version_recommend.py
index acff729245903dbddd538592417cb8f50de5cba3..bd853b9c9515d3781eba5d66880c442fff7ba682 100755
--- a/advisors/version_recommend.py
+++ b/advisors/version_recommend.py
@@ -750,7 +750,8 @@ class VersionRecommend(object):
         if _m is None:  # 版本号应该是数字开头
             return False
 
-        _m = re.search(r'[ab]', version)
+        # autoconf213 https://git.savannah.gnu.org/git/autoconf.git  
+        _m = re.search(r'[abcd]', version)
         if not _m is None:
             return False
 
diff --git a/upstream-info/GeoIP-GeoLite-data.yaml b/upstream-info/GeoIP-GeoLite-data.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f000784ed4216c18b9a93f32b162dc28dc6e5f40
--- /dev/null
+++ b/upstream-info/GeoIP-GeoLite-data.yaml
@@ -0,0 +1,5 @@
+---
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/HikariCP.yaml b/upstream-info/HikariCP.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f000784ed4216c18b9a93f32b162dc28dc6e5f40
--- /dev/null
+++ b/upstream-info/HikariCP.yaml
@@ -0,0 +1,5 @@
+---
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/ImageMagick.yaml b/upstream-info/ImageMagick.yaml
index 8e7d970d225be12cb6b10597124c5dedd3723f8c..418fa38e41900387cc94d8fcaf0cde716415d2eb 100644
--- a/upstream-info/ImageMagick.yaml
+++ b/upstream-info/ImageMagick.yaml
@@ -2,7 +2,7 @@
 version_control: github
 src_repo: ImageMagick/ImageMagick6
 tag_prefix: "^"
-separator: "."
+separator: "-"
 git_url: https://github.com/ImageMagick/ImageMagick6.git
 git_tag:
 - 2020-07-18 6.9.11-24
diff --git a/upstream-info/PyQt4.yaml b/upstream-info/PyQt4.yaml
index 7e2c4aaabacaa187ccb08ec571ed1a3907724ac4..2e98afaa294627efa2f6f1209161c68bb6b45093 100644
--- a/upstream-info/PyQt4.yaml
+++ b/upstream-info/PyQt4.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: pypi
-src_repo: PyQt4
-tag_prefix: "^"
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/pyqt/files/PyQt4
+tag_prefix: "^PyQt-"
 separator: "."
diff --git a/upstream-info/aesh.yaml b/upstream-info/aesh.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f000784ed4216c18b9a93f32b162dc28dc6e5f40
--- /dev/null
+++ b/upstream-info/aesh.yaml
@@ -0,0 +1,5 @@
+---
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/ant-contrib.yaml b/upstream-info/ant-contrib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f000784ed4216c18b9a93f32b162dc28dc6e5f40
--- /dev/null
+++ b/upstream-info/ant-contrib.yaml
@@ -0,0 +1,5 @@
+---
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/ant.yaml b/upstream-info/ant.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f000784ed4216c18b9a93f32b162dc28dc6e5f40
--- /dev/null
+++ b/upstream-info/ant.yaml
@@ -0,0 +1,5 @@
+---
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/apache-commons-chain.yaml b/upstream-info/apache-commons-chain.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..555e8e45ada56e696b9a61e6787486d73b62ca92
--- /dev/null
+++ b/upstream-info/apache-commons-chain.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: apache/commons-chain
+tag_prefix: "^CHAIN_"
+separator: "_"
diff --git a/upstream-info/apache-commons-csv.yaml b/upstream-info/apache-commons-csv.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c0c4b239729f2e8a6134446a1fdc9b7b05d23bd
--- /dev/null
+++ b/upstream-info/apache-commons-csv.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: apache/commons-csv
+tag_prefix: "^rel/commons-csv-"
+separator: "."
diff --git a/upstream-info/assertj-core.yaml b/upstream-info/assertj-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..20c8de1d8116bc497fea1ae019d727e2ee651757
--- /dev/null
+++ b/upstream-info/assertj-core.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: assertj/assertj-core
+tag_prefix: "^assertj-core-"
+separator: "."
diff --git a/upstream-info/atlas.yaml b/upstream-info/atlas.yaml
index 48b36bb6fbc73b0cbdeddad5ecd5c5e239135981..f991337d5ee990618ecb883aec740c5c8807461a 100644
--- a/upstream-info/atlas.yaml
+++ b/upstream-info/atlas.yaml
@@ -1,8 +1,5 @@
 ---
-version_control: github
-src_repo: math-atlas/math-atlas
-tag_prefix: "^v"
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/math-atlas/files/Stable
+tag_prefix:
 separator: "."
-git_url: https://github.com/math-atlas/math-atlas.git
-git_tag:
-- 2018-10-02 v3.11.40
diff --git a/upstream-info/authselect.yaml b/upstream-info/authselect.yaml
index 0cd5fd209c79e3f3f9a7ed4a682ab0598ffb2689..93ae30507938a0a74d2970c489de59eca8b13852 100644
--- a/upstream-info/authselect.yaml
+++ b/upstream-info/authselect.yaml
@@ -1,20 +1,5 @@
 ---
 version_control: github
-src_repo: pbrezina/authselect
-tag_prefix: "^v"
+src_repo: authselect/authselect
+tag_prefix:
 separator: "."
-git_url: https://github.com/pbrezina/authselect.git
-git_tag:
-- 2019-06-13 1.1
-- 2019-06-13 1.0.4
-- 2019-03-05 1.0.3
-- 2018-11-24 1.0.2
-- 2018-09-27 1.0.1
-- 2018-08-13 1.0
-- 2018-04-09 0.4
-- 2018-03-06 0.3.2
-- 2018-03-05 0.3.1
-- 2018-02-20 0.3
-- 2018-02-20 0.2
-- 2017-08-01 0.1-alpha
-- 2017-09-14 0.1
diff --git a/upstream-info/authz.yaml b/upstream-info/authz.yaml
index 4aa3d2308d9c48ea65f5788ae563f3a1cb7cf071..9c9e1ce83be8470195c6d4053f76c6712fea361b 100644
--- a/upstream-info/authz.yaml
+++ b/upstream-info/authz.yaml
@@ -1,3 +1,5 @@
 ---
 version_control: gitee
-src_repo: openEuler/authz
+src_repo: openeuler/authz
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/autoconf213.yaml b/upstream-info/autoconf213.yaml
index 95c1e3c5ac250d72601d6682564a9a271ad2de5a..76c3d2e02d2cfdcd2f5a7d24e7dafb0715d6c55b 100644
--- a/upstream-info/autoconf213.yaml
+++ b/upstream-info/autoconf213.yaml
@@ -1,8 +1,5 @@
 ---
 version_control: git
-src_repo: git://git.sv.gnu.org/autoconf
+src_repo: https://git.savannah.gnu.org/git/autoconf.git
 tag_prefix: "^v"
 separator: "."
-git_url: git://git.sv.gnu.org/autoconf
-git_tag:
-- 2020-07-13 v2.69b
diff --git a/upstream-info/autogen.yaml b/upstream-info/autogen.yaml
index ecc1b00eebce1abeeff54c6c2a2b65a415a09558..7ce347a44eaca0f00b34bf8e42bea81835a89f98 100644
--- a/upstream-info/autogen.yaml
+++ b/upstream-info/autogen.yaml
@@ -1,16 +1,5 @@
 ---
 version_control: git
-src_repo: https://git.code.sf.net/p/autogen/code
+src_repo: https://git.savannah.gnu.org/git/autogen.git
 tag_prefix: "^v"
-separator: "-"
-git_url: https://git.code.sf.net/p/autogen/code
-git_tag:
-- 2016-05-27 v5.18.11
-- 2016-05-24 v5.18.10
-- 2016-05-09 v5.18.9
-- 2016-03-08 v5.18.8
-- 2015-12-06 v5.18.7
-- 2015-09-12 v5.18.6
-- 2015-04-30 v5.18.5
-- 2014-09-01 v5-18-4
-- 2014-05-17 v5-18-3
+separator: "."
diff --git a/upstream-info/bind-dyndb-ldap.yaml b/upstream-info/bind-dyndb-ldap.yaml
index 8235325ec2ba6f8b58d8bee0ce2a119df2f7cceb..5a3ec93322634445dee245733a4795e0c146e940 100644
--- a/upstream-info/bind-dyndb-ldap.yaml
+++ b/upstream-info/bind-dyndb-ldap.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: github
-src_repo: freeipa/bind-dyndb-ldap
+version_control: git
+src_repo: https://pagure.io/bind-dyndb-ldap.git
 tag_prefix: "^v"
 separator: "."
-git_url: https://github.com/freeipa/bind-dyndb-ldap.git
diff --git a/upstream-info/blivet-gui.yaml b/upstream-info/blivet-gui.yaml
index 0ed6001e923db1b4116d5120916fb7fee75dd610..84796a7be67defe7e5e8dd05e7fe1cdfa97198dd 100644
--- a/upstream-info/blivet-gui.yaml
+++ b/upstream-info/blivet-gui.yaml
@@ -1,116 +1,5 @@
 ---
 version_control: github
 src_repo: storaged-project/blivet-gui
-tag_prefix: "^v"
+tag_prefix:
 separator: "."
-git_url: https://github.com/storaged-project/blivet-gui.git
-git_tag:
-- 2020-07-02 2.1.15-1
-- 2020-04-22 2.1.14-1
-- 2020-03-31 2.1.13-1
-- 2020-01-29 2.1.12-1
-- 2019-07-31 2.1.11-1
-- 2018-12-12 2.1.10-1
-- 2018-12-12 2.1.10
-- 2018-09-26 2.1.9-1
-- 2018-09-26 2.1.9
-- 2018-01-15 2.1.8-1
-- 2018-01-15 2.1.8
-- 2017-09-19 2.1.7-1
-- 2017-09-19 2.1.7
-- 2017-08-18 2.1.6-1
-- 2017-08-18 2.1.6
-- 2017-06-20 2.1.5-1
-- 2017-06-20 2.1.5
-- 2017-05-05 2.1.4-1
-- 2017-05-05 2.1.4
-- 2017-04-24 2.1.3-1
-- 2017-04-24 2.1.3
-- 2017-04-11 2.1.2-1
-- 2017-04-11 2.1.2
-- 2017-03-14 2.1.1-1
-- 2017-03-14 2.1.1
-- 2017-02-27 2.1.0-1
-- 2017-02-27 2.1.0
-- 2016-12-12 2.0.2-1
-- 2016-12-12 2.0.2
-- 2016-08-04 2.0.1-1
-- 2016-08-04 2.0.1
-- 2016-07-18 2.0.0-1
-- 2016-07-18 2.0.0
-- 2016-05-23 1.3.1-1
-- 2016-05-23 1.3.1
-- 2016-05-23 1.2.4-1
-- 2016-05-23 1.2.4
-- 2016-05-23 1.0.7-1
-- 2016-05-23 1.0.7
-- 2016-04-12 1.3.0-1
-- 2016-04-12 1.3.0
-- 2016-04-12 1.0.6-1
-- 2016-04-12 1.0.6
-- 2016-04-12 1.2.3-1
-- 2016-04-12 1.2.3
-- 2016-03-03 1.0.5-1
-- 2016-03-03 1.0.5
-- 2016-03-03 1.2.2-1
-- 2016-03-03 1.2.2
-- 2016-02-24 1.2.1-1
-- 2016-02-24 1.2.1
-- 2016-02-23 1.0.4-1
-- 2016-02-23 1.0.4
-- 2015-12-07 1.0.3-1
-- 2015-12-07 1.0.3
-- 2015-11-18 1.2-1
-- 2015-11-18 1.2
-- 2015-11-09 1.0.2-1
-- 2015-11-09 1.0.2
-- 2015-10-02 1.0.1-1
-- 2015-10-02 1.0.1
-- 2015-09-23 1.1-1
-- 2015-09-23 1.1
-- 2015-09-03 1.0-1
-- 2015-09-03 1.0
-- 2015-08-11 0.2.9-1
-- 2015-08-11 0.2.9
-- 2015-08-06 0.3.6-1
-- 2015-08-06 0.3.6
-- 2015-07-29 0.3.5-1
-- 2015-07-29 0.3.5
-- 2015-07-16 0.3.4-1
-- 2015-07-16 0.3.4
-- 2015-06-18 0.2.8-1
-- 2015-06-18 0.2.8
-- 2015-05-26 0.2.7-1
-- 2015-05-26 0.2.7
-- 2015-05-25 0.2.6-1
-- 2015-05-25 0.2.6
-- 2015-05-21 0.3.3-1
-- 2015-05-21 0.3.3
-- 2015-05-14 0.3.2-1
-- 2015-05-14 0.3.2
-- 2015-05-05 0.2.5-1
-- 2015-05-05 0.2.5
-- 2015-04-27 0.3.1-1
-- 2015-04-27 0.3.1
-- 2015-04-13 0.2.4-1
-- 2015-04-13 0.2.4
-- 2015-03-13 0.2.3-1
-- 2015-03-13 0.2.3
-- 2015-02-23 0.2.2-1
-- 2015-02-23 0.2.2
-- 2015-02-18 0.2.1-1
-- 2015-02-18 0.2.1
-- 2015-01-20 blivet-gui-0.2.0-2
-- 2015-01-20 blivet-gui-0.2.0-1
-- 2015-01-20 blivet-gui-0.2.0
-- 2015-01-19 blivet-gui-0.1.11-1
-- 2015-01-19 blivet-gui-0.1.11
-- 2015-01-07 blivet-gui-0.1.10-1
-- 2015-01-07 blivet-gui-0.1.10
-- 2014-05-12 thesis-final
-- 2015-01-20 blivet-gui-0.2.0-3
-- 2015-01-22 0.2.0-6
-- 2015-01-22 0.2.0-5
-- 2015-01-22 0.2.0-4
-- 2014-10-13 0.1.9
-- 2014-09-02 0.1.8
diff --git a/upstream-info/ca-certificates.yaml b/upstream-info/ca-certificates.yaml
index c4a63b355d0a8310abead14b0e2e54ba9edf2f37..22d6150157eca3f6eb2a0e7dd10c1e2feaacc2ca 100644
--- a/upstream-info/ca-certificates.yaml
+++ b/upstream-info/ca-certificates.yaml
@@ -1,7 +1,6 @@
 ---
-version_control: NA
-src_repo: NA
+version_control: git
+src_repo: https://src.fedoraproject.org/rpms/ca-certificates.git
 tag_prefix: ca-certificates-
-separator: "[-_]"
+separator: "_"
 git_url: https://src.fedoraproject.org/rpms/ca-certificates.git
-git_tag:
diff --git a/upstream-info/cglib.yaml b/upstream-info/cglib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..215a7cc421a36977b137ff5697d92a4e49d117fc
--- /dev/null
+++ b/upstream-info/cglib.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: cglib/cglib
+tag_prefix: "^RELEASE_"
+separator: "_"
diff --git a/upstream-info/cronie.yaml b/upstream-info/cronie.yaml
index 7f2d988b05391176c906693504199a9e9b235cb4..771bbe9a0b8a8a5e11f9639454113f79482dddc5 100644
--- a/upstream-info/cronie.yaml
+++ b/upstream-info/cronie.yaml
@@ -1,34 +1,5 @@
 ---
 version_control: github
 src_repo: cronie-crond/cronie
-tag_prefix: "^v"
+tag_prefix: "^cronie-?"
 separator: "."
-git_url: https://github.com/cronie-crond/cronie.git
-git_tag:
-- 2007-10-29 v4.3
-- 2007-08-28 v4.2
-- 2007-08-17 v4.1
-- 2015-05-28 cronie1.5.0
-- 2012-11-22 cronie1.4.9
-- 2011-06-27 cronie1.4.8
-- 2011-03-15 cronie1.4.7
-- 2010-10-22 cronie1.4.6
-- 2010-08-02 cronie1.4.5
-- 2010-02-18 cronie1.4.4
-- 2009-11-03 cronie1.4.3
-- 2009-10-12 cronie1.4.2
-- 2014-09-17 cronie1.4.12
-- 2013-07-18 cronie1.4.11
-- 2012-11-27 cronie1.4.10
-- 2009-07-30 cronie1.4.1
-- 2009-07-21 cronie1.4
-- 2009-04-27 cronie1.3
-- 2008-06-26 cronie1.2
-- 2008-01-31 cronie1.0
-- 2019-10-31 cronie-1.5.5
-- 2019-03-18 cronie-1.5.4-final
-- 2019-03-18 cronie-1.5.4
-- 2019-03-15 cronie-1.5.3
-- 2018-05-03 cronie-1.5.2
-- 2016-06-23 cronie-1.5.1
-- 2008-05-30 cronie-1.1
diff --git a/upstream-info/cups-filters.yaml b/upstream-info/cups-filters.yaml
index d1db3d8cade0eaaed1328e79f1a2624310b639d3..949618633d624e7ea1bdd9846d2a5c62d0d7a585 100644
--- a/upstream-info/cups-filters.yaml
+++ b/upstream-info/cups-filters.yaml
@@ -2,12 +2,4 @@
 version_control: github
 src_repo: OpenPrinting/cups-filters
 tag_prefix: "^release-"
-separator: "."
-git_url: https://github.com/OpenPrinting/cups-filters.git
-git_tag:
-- 2020-06-05 release-1-27-5
-- 2020-04-09 release-1-27-4
-- 2020-03-20 release-1-27-3
-- 2020-02-28 release-1-27-2
-- 2020-02-16 release-1-27-1
-- 2020-01-26 release-1-27-0
+separator: "-"
diff --git a/upstream-info/dejagnu.yaml b/upstream-info/dejagnu.yaml
index 43b396646c47ff3f931237f4201a4d6b49c49eb0..fd2b842646de327aefe52297fc13bac21a53ced1 100644
--- a/upstream-info/dejagnu.yaml
+++ b/upstream-info/dejagnu.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: git
 src_repo: https://git.savannah.gnu.org/git/dejagnu.git
-tag_prefix: "^dejagnu-"
+tag_pattern: "dejagnu-(.*)-release"
 separator: "."
-git_url: https://git.savannah.gnu.org/git/dejagnu.git
-git_tag:
diff --git a/upstream-info/docbook-style-xsl.yaml b/upstream-info/docbook-style-xsl.yaml
index 3057b8057497fe86f9c15b7e7f55bde9efed2f35..ce839b7afff53c09c75592611d7b8f95aaf724d7 100644
--- a/upstream-info/docbook-style-xsl.yaml
+++ b/upstream-info/docbook-style-xsl.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: github
 src_repo: docbook/xslt10-stylesheets
-tag_prefix: "^snapshot/"
-separator: "-"
+tag_prefix: "^release/"
+separator: "."
diff --git a/upstream-info/emma.yaml b/upstream-info/emma.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..438ce8a51e6540b7cbd5aa4eea271d9123f91030
--- /dev/null
+++ b/upstream-info/emma.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/emma/files/emma-release
+tag_prefix:
+separator: "."
diff --git a/upstream-info/enchant.yaml b/upstream-info/enchant.yaml
index 186b514fdff5e5c6fc1317ab15d74ba1f6f8f848..fefe7da06df64a7bfd16b86eb6e6105184a313c3 100644
--- a/upstream-info/enchant.yaml
+++ b/upstream-info/enchant.yaml
@@ -1,32 +1,5 @@
 ---
 version_control: github
 src_repo: AbiWord/enchant
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/AbiWord/enchant.git
-git_tag:
-- 2020-02-27 v2.2.8
-- 2019-09-11 v2.2.7
-- 2019-09-05 v2.2.6
-- 2019-09-01 v2.2.5
-- 2019-06-17 v2.2.4
-- 2018-02-04 v2.2.3
-- 2018-02-03 v2.2.2
-- 2018-01-03 v2.2.1
-- 2017-12-12 v2.2.0
-- 2017-11-26 v2.1.3
-- 2017-09-08 v2.1.1
-- 2013-07-23 release-0-3-0
-- 2013-07-23 release-0-1-1
-- 2013-07-23 enchant-1-6-0
-- 2013-07-23 enchant-1-5-0
-- 2013-07-23 enchant-1-4-2
-- 2013-07-23 enchant-1-4-0
-- 2013-07-23 enchant-1-3-0
-- 2013-07-23 enchant-1-2-1
-- 2013-07-23 enchant-1-1-1
-- 2013-07-23 enchant-1-0-0
-- 2017-09-28 v2.1.2
-- 2017-08-08 v2.1.0
-- 2017-08-04 v2.0.0
-- 2017-02-08 enchant-1-6-1
+tag_prefix: "^v|enchant-"
+separator: "-"
diff --git a/upstream-info/ghostscript.yaml b/upstream-info/ghostscript.yaml
index 2445ac4a36e62469675acebd5ea03db99fe946c9..30ab7f04fbed6d093427732496447bc239982600 100644
--- a/upstream-info/ghostscript.yaml
+++ b/upstream-info/ghostscript.yaml
@@ -1,38 +1,5 @@
 ---
-version_control: github
-src_repo: ArtifexSoftware/ghostpdl-downloads
-tag_prefix: "^v"
+version_control: git
+src_repo: https://git.ghostscript.com/ghostpdl.git
+tag_prefix: "^ghostscript-"
 separator: "."
-git_url: https://github.com/ArtifexSoftware/ghostpdl-downloads.git
-git_tag:
-- 2020-03-19 gs952
-- 2019-10-15 gs951rc3
-- 2020-03-12 gs951
-- 2019-04-04 gs950
-- 2019-04-04 gs928rc4
-- 2019-04-04 gs928rc3
-- 2019-04-04 gs928rc2
-- 2019-04-04 gs928rc1
-- 2019-04-04 gs927
-- 2018-09-13 gs926
-- 2018-09-03 gs925rc1
-- 2018-09-03 gs925
-- 2018-03-27 gs924rc2
-- 2018-03-27 gs924
-- 2017-10-04 gs923rc1
-- 2017-10-04 gs923
-- 2017-03-21 gs922rc2
-- 2017-03-21 gs922rc1
-- 2017-10-04 gs922
-- 2017-03-16 gs921
-- 2016-04-28 gs920rc1
-- 2016-09-27 gs920
-- 2016-04-28 gs919
-- 2016-01-26 gs918
-- 2019-04-04 gs9.27
-- 2018-09-13 gs9.26rc1
-- 2019-10-15 ghostpdl-9.51rc2
-- 2020-03-12 ghostpdl-9.51
-- 2018-09-13 9.27rc1
-- 2019-04-04 9.27
-- 2016-09-27 9.21rc1
diff --git a/upstream-info/glassfish-jaxb.yaml b/upstream-info/glassfish-jaxb.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5afd86deba15dd0819dcc8e535be6cb349a1f199
--- /dev/null
+++ b/upstream-info/glassfish-jaxb.yaml
@@ -0,0 +1,6 @@
+---
+version_control: github
+src_repo: javaee/jaxb-v2
+tag_prefix: "^jaxb-" 
+separator: "_"
+
diff --git a/upstream-info/glib.yaml b/upstream-info/glib.yaml
index 61ce573127dd5791b64a324ccade5df5d81b3129..19ba2d78d6b15f3e335bb07052c7876bed272561 100644
--- a/upstream-info/glib.yaml
+++ b/upstream-info/glib.yaml
@@ -1,23 +1,5 @@
 ---
-version_control: github
-src_repo: GNOME/glib
-tag_prefix: "^"
-separator: "."
-git_url: https://github.com/GNOME/glib.git
-git_tag:
-- 2020-06-18 2.65.0
-- 2020-02-27 2.64.0
-- 2020-02-24 2.63.6
-- 2020-02-03 2.63.5
-- 2020-01-21 2.63.4
-- 2019-12-16 2.63.3
-- 2019-11-25 2.63.2
-- 2019-10-31 2.63.1
-- 2019-10-04 2.63.0
-- 2019-09-05 2.62.0
-- 2019-09-02 2.61.3
-- 2019-07-29 2.61.2
-- 2019-05-24 2.61.1
-- 2019-04-15 2.61.0
-- 2019-02-18 2.59.3
-- 2019-02-04 2.59.2
+version_control: gitlab.gnome
+src_repo: glib
+tag_prefix: "^GLIB_"
+separator: "_"
diff --git a/upstream-info/gmp.yaml b/upstream-info/gmp.yaml
index 5b9a58414595de8fc513942164c22d71ca0f9f9d..ffb3bb02a58e461f5eb712164c641f09cd182ba2 100644
--- a/upstream-info/gmp.yaml
+++ b/upstream-info/gmp.yaml
@@ -1,6 +1,6 @@
 ---
 version_control: hg
-src_repo: https://gmplib.org/repo/gmp/
+src_repo: https://gmplib.org/repo/gmp
 tag_prefix: "^gmp-"
 separator: "."
 url: https://gmplib.org/devel/repo-usage
diff --git a/upstream-info/gphoto2.yaml b/upstream-info/gphoto2.yaml
index af0988b79cfb7a8f7c40ed46dcd96905a7add596..eee5527a8857339c0173999dac51f12beecc8613 100644
--- a/upstream-info/gphoto2.yaml
+++ b/upstream-info/gphoto2.yaml
@@ -1,14 +1,6 @@
 ---
 version_control: github
 src_repo: gphoto/gphoto2
-tag_prefix: gphoto2-
-separator: _
+tag_pattern: "gphoto2-(.*)-release"
+separator: "_"
 git_url: https://github.com/gphoto/gphoto2.git
-git_tag:
-- 2015-11-18 gphoto2-2_5_9-release
-- 2019-06-02 gphoto2-2_5_23-release
-- 2018-10-27 gphoto2-2_5_20-release
-- 2018-04-16 gphoto2-2_5_17-release
-- 2017-10-02 gphoto2-2_5_15-release
-- 2016-11-20 gphoto2-2_5_11-release
-- 2016-03-23 gphoto2-2_5_10-release
diff --git a/upstream-info/gstreamer-plugins-good.yaml b/upstream-info/gstreamer-plugins-good.yaml
index 0096b69b9e27d61f3b6fdbd6d25002fb06ed9bb5..9e2242a3a582b3565189ae172a67b48bf28060a6 100644
--- a/upstream-info/gstreamer-plugins-good.yaml
+++ b/upstream-info/gstreamer-plugins-good.yaml
@@ -1,9 +1,5 @@
 ---
-version_control: github
-src_repo: GStreamer/gst-plugins-good
-tag_prefix: "^"
+version_control: git
+src_repo: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good
+tag_prefix: "^RELEASE-"
 separator: "."
-git_url: https://github.com/GStreamer/gst-plugins-good.git
-git_tag:
-- 2020-07-03 1.17.2
-- 2020-06-19 1.17.1
diff --git a/upstream-info/gtk.yaml b/upstream-info/gtk.yaml
index 9a04fa94647cc23bdf693fe0e814180b36788120..634ae529b1afb2b17ea67ccfca6bfbaa79544fd1 100644
--- a/upstream-info/gtk.yaml
+++ b/upstream-info/gtk.yaml
@@ -1,8 +1,5 @@
 ---
 version_control: gitlab.gnome
 src_repo: gtk
-tag_prefix: "^"
-separator: "."
-git_url: https://gitlab.gnome.org/GNOME/gtk.git
-git_tag:
-- 2020-06-06 3.98.5
+tag_prefix: "^GTK_"
+separator: "_"
diff --git a/upstream-info/hplip.yaml b/upstream-info/hplip.yaml
index 59ac58c3df554fafdfff692c9e622c1fb232a73c..2a4b276decdb9693a00d48cf06a35febfe2494be 100644
--- a/upstream-info/hplip.yaml
+++ b/upstream-info/hplip.yaml
@@ -1,4 +1,4 @@
-version_control: git
-src_repo: https://salsa.debian.org/printing-team/hplip
-tag_prefix: upstream/
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/hplip/files/hplip
+tag_prefix:
 separator: .
diff --git a/upstream-info/hsqldb1.yaml b/upstream-info/hsqldb1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..545a41574315a05917959dd769cad20f750b9a0e
--- /dev/null
+++ b/upstream-info/hsqldb1.yaml
@@ -0,0 +1,6 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/hsqldb/files/hsqldb
+tag_prefix: "^hsqldb_"
+separator: "_"
+
diff --git a/upstream-info/hyphen.yaml b/upstream-info/hyphen.yaml
index 489e864f0ba3e833bb48f46bc150fa6ec148a520..d74fb7b78cfccb2505f38e186c0248e6514e2f14 100644
--- a/upstream-info/hyphen.yaml
+++ b/upstream-info/hyphen.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: github
-src_repo: hunspell/hyphen
-tag_prefix: 
-separator: 
-git_url: https://github.com/hunspell/hyphen.git
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/hunspell/files/Hyphen
+tag_prefix:
+separator:
diff --git a/upstream-info/initial-setup.yaml b/upstream-info/initial-setup.yaml
index 364b3d1838acc622d71e1a8b7e604582d733d357..fa33a73d50f086aa1bb53fc96ee09342c42e7dab 100644
--- a/upstream-info/initial-setup.yaml
+++ b/upstream-info/initial-setup.yaml
@@ -1,45 +1,5 @@
 ---
 version_control: github
 src_repo: rhinstaller/initial-setup
-tag_prefix: "^v"
+tag_prefix: "^r"
 separator: "."
-git_url: https://github.com/rhinstaller/initial-setup.git
-git_tag:
-- 2020-06-08 r0.3.82-1
-- 2020-05-22 r0.3.81-1
-- 2019-12-10 r0.3.80-1
-- 2019-11-18 r0.3.79-1
-- 2019-11-12 r0.3.78-1
-- 2019-10-24 r0.3.77-1
-- 2019-10-04 r0.3.76-1
-- 2019-10-03 r0.3.75-1
-- 2019-09-18 r0.3.74-1
-- 2019-07-31 r0.3.73-1
-- 2019-06-20 r0.3.72-1
-- 2019-06-13 r0.3.71-1
-- 2019-05-15 r0.3.70-1
-- 2019-03-12 r0.3.67-1
-- 2019-01-21 r0.3.66-1
-- 2019-01-03 r0.3.65-1
-- 2018-11-19 r0.3.64-1
-- 2018-11-05 r0.3.63-1
-- 2018-07-27 r0.3.62-1
-- 2018-05-09 r0.3.61-1
-- 2018-05-04 r0.3.60-1
-- 2018-04-23 r0.3.59-1
-- 2018-04-19 r0.3.58-1
-- 2018-03-19 r0.3.56-1
-- 2018-03-05 r0.3.55-1
-- 2018-02-28 r0.3.54-1
-- 2017-11-29 r0.3.52-1
-- 2017-10-05 r0.3.51-1
-- 2017-09-11 r0.3.50-1
-- 2017-08-30 r0.3.49-1
-- 2017-07-12 r0.3.48-1
-- 2017-05-24 r0.3.46-1
-- 2017-05-17 r0.3.45-1
-- 2017-05-15 r0.3.44-1
-- 2016-09-21 r0.3.43-1
-- 2019-04-04 r0.3.69-1
-- 2019-03-12 r0.3.68-1
-- 2017-07-12 r0.3.47-1
diff --git a/upstream-info/istack-commons.yaml b/upstream-info/istack-commons.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2175e03df9fed352d7b704091061add491c9803f
--- /dev/null
+++ b/upstream-info/istack-commons.yaml
@@ -0,0 +1,6 @@
+---
+version_control: github
+src_repo: javaee/jaxb-istack-commons
+tag_prefix: "^istack-commons-"
+separator: "."
+
diff --git a/upstream-info/isula-build.yaml b/upstream-info/isula-build.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1b2694a9f3cc35038b9e49e4fb5d41ea35f882dd
--- /dev/null
+++ b/upstream-info/isula-build.yaml
@@ -0,0 +1,5 @@
+---
+version_control: gitee
+src_repo: openeuler/isula-build
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/java-atk-wrapper.yaml b/upstream-info/java-atk-wrapper.yaml
index ebc2f1b28b9b7cd315b83e3c185c7b2ed18af1ef..317bf7ebf072a460ec3e6cf7ce6f98e0c6ccf2ba 100644
--- a/upstream-info/java-atk-wrapper.yaml
+++ b/upstream-info/java-atk-wrapper.yaml
@@ -1,12 +1,5 @@
 ---
-version_control: git
-src_repo: https://gitlab.gnome.org/GNOME/java-atk-wrapper.git
-tag_prefix: "^v"
-separator: "."
-git_url: https://gitlab.gnome.org/GNOME/java-atk-wrapper.git
-git_tag:
-- 2020-03-05 0.38.0
-- 2019-10-09 0.37.1
-- 2019-09-07 0.36.0
-- 2019-08-20 0.35.91
-- 2019-08-02 0.35.0
+version_control: gitlab.gnome
+src_repo: java-atk-wrapper
+tag_prefix: "^JAVA_ATK_WRAPPER_"
+separator: "_"
diff --git a/upstream-info/jbig2dec.yaml b/upstream-info/jbig2dec.yaml
index 2445ac4a36e62469675acebd5ea03db99fe946c9..1852e58f861aaba4ebefc0d13d5009fcffc8b6ad 100644
--- a/upstream-info/jbig2dec.yaml
+++ b/upstream-info/jbig2dec.yaml
@@ -1,38 +1,5 @@
 ---
 version_control: github
-src_repo: ArtifexSoftware/ghostpdl-downloads
-tag_prefix: "^v"
+src_repo: ArtifexSoftware/jbig2dec
+tag_prefix:
 separator: "."
-git_url: https://github.com/ArtifexSoftware/ghostpdl-downloads.git
-git_tag:
-- 2020-03-19 gs952
-- 2019-10-15 gs951rc3
-- 2020-03-12 gs951
-- 2019-04-04 gs950
-- 2019-04-04 gs928rc4
-- 2019-04-04 gs928rc3
-- 2019-04-04 gs928rc2
-- 2019-04-04 gs928rc1
-- 2019-04-04 gs927
-- 2018-09-13 gs926
-- 2018-09-03 gs925rc1
-- 2018-09-03 gs925
-- 2018-03-27 gs924rc2
-- 2018-03-27 gs924
-- 2017-10-04 gs923rc1
-- 2017-10-04 gs923
-- 2017-03-21 gs922rc2
-- 2017-03-21 gs922rc1
-- 2017-10-04 gs922
-- 2017-03-16 gs921
-- 2016-04-28 gs920rc1
-- 2016-09-27 gs920
-- 2016-04-28 gs919
-- 2016-01-26 gs918
-- 2019-04-04 gs9.27
-- 2018-09-13 gs9.26rc1
-- 2019-10-15 ghostpdl-9.51rc2
-- 2020-03-12 ghostpdl-9.51
-- 2018-09-13 9.27rc1
-- 2019-04-04 9.27
-- 2016-09-27 9.21rc1
diff --git a/upstream-info/jboss-annotations-1.2-api.yaml b/upstream-info/jboss-annotations-1.2-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5042ee90286ea2a51bb2cbce9f9e5849ea5523f0
--- /dev/null
+++ b/upstream-info/jboss-annotations-1.2-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-annotations-api_spec
+tag_pattern: "jboss-annotations-api_1.2_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-jaxrs-2.0-api.yaml b/upstream-info/jboss-jaxrs-2.0-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a6efb1fdec0c9b41d1de91d9e21796e296af851e
--- /dev/null
+++ b/upstream-info/jboss-jaxrs-2.0-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-jaxrs-api_spec
+tag_pattern: "jboss-jaxrs-api_2.0_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-jsf-2.1-api.yaml b/upstream-info/jboss-jsf-2.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3fbeca845107e38424e82aab68af03db262824f6
--- /dev/null
+++ b/upstream-info/jboss-jsf-2.1-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-jsf-api_spec
+tag_pattern: "jboss-jsf-api_2.1_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-jsp-2.2-api.yaml b/upstream-info/jboss-jsp-2.2-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e264bdbeafcb4be20a16c5838658f45a4f20bd70
--- /dev/null
+++ b/upstream-info/jboss-jsp-2.2-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-jsp-api_spec
+tag_pattern: "jboss-jsp-api_2.2_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-jsp-2.3-api.yaml b/upstream-info/jboss-jsp-2.3-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..33e3a5b473553300c521bee354774db31fd7e514
--- /dev/null
+++ b/upstream-info/jboss-jsp-2.3-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-jsp-api_spec
+tag_pattern: "jboss-jsp-api_2.3_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-jstl-1.2-api.yaml b/upstream-info/jboss-jstl-1.2-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d0955c2928f06b5abc2569cab0679e057edc412a
--- /dev/null
+++ b/upstream-info/jboss-jstl-1.2-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-jstl-api_spec
+tag_pattern: "jboss-jstl-api_1.2_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jboss-servlet-3.1-api.yaml b/upstream-info/jboss-servlet-3.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6b93814a6bcbf53e45481384df973feb297f7e66
--- /dev/null
+++ b/upstream-info/jboss-servlet-3.1-api.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jboss/jboss-servlet-api_spec
+tag_pattern: "jboss-servlet-api_3.1_spec-(.*).Final"
+separator: "."
diff --git a/upstream-info/jdeparser1.yaml b/upstream-info/jdeparser1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d68baad1325be773bc7229a0c297dba6490f5291
--- /dev/null
+++ b/upstream-info/jdeparser1.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jdeparser/jdeparser
+tag_pattern: "(.*).Final"
+separator: "."
diff --git a/upstream-info/jfsutils.yaml b/upstream-info/jfsutils.yaml
index 9822f5407ffd173c6e2bc36c281f9907b8811000..af0ee415cc549755195146884facfe9fcf85de36 100644
--- a/upstream-info/jfsutils.yaml
+++ b/upstream-info/jfsutils.yaml
@@ -2,7 +2,7 @@
 version_control: github
 src_repo: pld-linux/jfsutils
 tag_prefix: "^.*jfsutils-"
-separator: "."
+separator: "_"
 git_url: https://github.com/pld-linux/jfsutils.git
 git_tag:
 - 2012-06-24 jfsutils-1_1_2-2
diff --git a/upstream-info/jnr-netdb.yaml b/upstream-info/jnr-netdb.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..da9e118a9663f2b670ace8856a668afe9c4eacbb
--- /dev/null
+++ b/upstream-info/jnr-netdb.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: jnr/jnr-netdb
+tag_prefix: "^jnr-netdb-"
+separator: "."
diff --git a/upstream-info/js-jquery.yaml b/upstream-info/js-jquery.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a2aefb7a3b3a4bd7d3c6b2ee6f937efa0fac55b9
--- /dev/null
+++ b/upstream-info/js-jquery.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jquery/jquery
+tag_prefix:
+seperator: "."
diff --git a/upstream-info/kacst-fonts.yaml b/upstream-info/kacst-fonts.yaml
index 39ddcd9db5de2807c9c1cf96096e0020d117c465..d02029c7e6a5c7b4e74f9bc3c01af20f8be6d3a2 100644
--- a/upstream-info/kacst-fonts.yaml
+++ b/upstream-info/kacst-fonts.yaml
@@ -1,7 +1,5 @@
 ---
-version_control: github
-src_repo: gooselinux/kacst-fonts
-tag_prefix: "^v"
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/arabeyes/files/kacst_fonts/
+tag_prefix: "^kacst_(one|fonts)_"
 separator: "."
-git_url: https://github.com/gooselinux/kacst-fonts.git
-git_tag:
diff --git a/upstream-info/kohsuke-pom.yaml b/upstream-info/kohsuke-pom.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c231fd78ec36de2ebd96fd72807e869bfd42ce2c
--- /dev/null
+++ b/upstream-info/kohsuke-pom.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: kohsuke/pom
+tag_prefix: "^pom-"
+separator:
diff --git a/upstream-info/krb5.yaml b/upstream-info/krb5.yaml
index a54a7cc4e9cb53190658edafa167fea37f8aaf57..569dfaba7b7d467b22c1abec4a02711e5450d86c 100644
--- a/upstream-info/krb5.yaml
+++ b/upstream-info/krb5.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: github
 src_repo: krb5/krb5
-tag_prefix: "^krb5-"
+tag_pattern: "krb5-(.*)-final"
 separator: "."
-git_url: https://github.com/krb5/krb5.git
-git_tag:
diff --git a/upstream-info/less.yaml b/upstream-info/less.yaml
index 0a8435c89c6c889a4cce64947e71cf797fa82f99..5605792904cbabb33ee0e5746cf805ae8f10c259 100644
--- a/upstream-info/less.yaml
+++ b/upstream-info/less.yaml
@@ -1,30 +1,5 @@
 ---
 version_control: github
-src_repo: jftuga/less-Windows
-tag_prefix: "^less-v"
-separator: "."
-git_url: https://github.com/jftuga/less-Windows.git
-git_tag:
-- 2020-06-13 v563
-- 2020-05-19 v562
-- 2020-05-11 v561
-- 2020-05-04 v560
-- 2020-04-19 v559
-- 2020-04-17 v558
-- 2020-03-21 v557
-- 2020-03-15 v556
-- 2020-03-15 v555
-- 2020-03-05 v554
-- 2020-01-19 v553
-- 2019-06-11 v551
-- 2019-02-16 v550
-- 2019-02-14 v548
-- 2019-02-14 v549
-- 2018-11-30 v547
-- 2018-11-29 v546
-- 2018-11-22 v545
-- 2018-11-17 v544
-- 2018-11-06 v542
-- 2018-10-29 v540
-- 2018-11-13 v543
-- 2018-10-30 v541
+src_repo: gwsw/less
+tag_prefix: "^v"
+separator:
diff --git a/upstream-info/libXfont2.yaml b/upstream-info/libXfont2.yaml
index d10f4195a2d51cb1151f0941e28a77796f27724b..48da0f2f22b0401a6d37677198657e95e7067f3b 100644
--- a/upstream-info/libXfont2.yaml
+++ b/upstream-info/libXfont2.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: github
-src_repo: clearlinux-pkgs/libXfont2
-tag_prefix: 
+version_control: git
+src_repo: https://gitlab.freedesktop.org/xorg/lib/libxfont
+tag_prefix: "^libXfont2-"
 separator: "."
-git_url: https://github.com/clearlinux-pkgs/libXfont2.git
diff --git a/upstream-info/libcgroup.yaml b/upstream-info/libcgroup.yaml
index 2a2cecd77a75e2dd11f677f45894d87f69dce185..6562a76ddff304c678a4ea3f6b19baf5ce8d1fff 100644
--- a/upstream-info/libcgroup.yaml
+++ b/upstream-info/libcgroup.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: git
-src_repo: https://git.code.sf.net/p/libcg/libcg
+version_control: github
+src_repo: libcgroup/libcgroup
 tag_prefix: "^v"
 separator: "."
diff --git a/upstream-info/libclc.yaml b/upstream-info/libclc.yaml
index 1d3e4451815fdd831d97b30af808f61a3c1a7e99..51403844b0d00113494534a888a7938697fa8583 100644
--- a/upstream-info/libclc.yaml
+++ b/upstream-info/libclc.yaml
@@ -1,7 +1,6 @@
 ---
 version_control: github
-src_repo: llvm-mirror/libclc
-tag_prefix: "^v"
+src_repo: llvm/llvm-project
+tag_prefix: "^llvmorg-"
 separator: "."
-git_url: https://github.com/llvm-mirror/libclc.git
-git_tag:
+git_url: https://github.com/llvm/llvm-project/tree/master/libclc
diff --git a/upstream-info/libdvdread.yaml b/upstream-info/libdvdread.yaml
index 2bd89b4002cc199a102280ec0c01aa54b18bfc8f..dcd3a381b87118d9d72acc23934762000f42d685 100644
--- a/upstream-info/libdvdread.yaml
+++ b/upstream-info/libdvdread.yaml
@@ -1,12 +1,5 @@
 ---
-git_url: https://github.com/mirror/libdvdread.git
-version_control: github
-src_repo: mirror/libdvdread
-tag_prefix: v
+version_control: git
+src_repo: https://code.videolan.org/videolan/libdvdread
+tag_prefix:
 separator: "."
-git_tag:
-- 2015-03-25 5.0.3
-- 2015-01-28 5.0.2
-- 2015-01-03 5.0.1
-- 2014-07-31 5.0.0
-- 2014-04-09 4.9.9
diff --git a/upstream-info/libfprint.yaml b/upstream-info/libfprint.yaml
index 6ffb502c1c8cc39c4f9ee022e5302a11d4751ddd..3622f02961f87a2be99a5e64c34ab1ff51f1fc57 100644
--- a/upstream-info/libfprint.yaml
+++ b/upstream-info/libfprint.yaml
@@ -1,8 +1,5 @@
 ---
-git_url: https://gitlab.freedesktop.org/libfprint/libfprint.git
 version_control: git
 src_repo: https://gitlab.freedesktop.org/libfprint/libfprint
-tag_prefix: "^v"
-separator: "."
-git_tag:
-- 2020-06-08 v1.90.2
+tag_prefix: "^v|V_"
+separator: "_"
diff --git a/upstream-info/libgphoto2.yaml b/upstream-info/libgphoto2.yaml
index 66bf584fbf2c65a808967f65e419876a9454df77..e02e1b2d2b39c28c412ab0fba63763799f3e0ac1 100644
--- a/upstream-info/libgphoto2.yaml
+++ b/upstream-info/libgphoto2.yaml
@@ -1,9 +1,5 @@
 ---
 version_control: github
 src_repo: gphoto/libgphoto2
-tag_prefix: libgphoto2-
-separator: _
-git_url: https://github.com/gphoto/libgphoto2.git
-git_tag:
-- 2020-05-24 v2.5.25
-- 2020-05-24 libgphoto2-2_5_25-release
+tag_pattern: "libgphoto2-(.*)-release"
+separator: "_"
diff --git a/upstream-info/libibmad.yaml b/upstream-info/libibmad.yaml
index 8761ddc534cb289abcb7607ea24fb7e38b4bf67a..df962bc0f770731a1dc282a247fc2eb7aee8a433 100644
--- a/upstream-info/libibmad.yaml
+++ b/upstream-info/libibmad.yaml
@@ -1,12 +1,5 @@
 ---
-git_url: https://github.com/linux-rdma/infiniband-diags
 version_control: github
-src_repo: linux-rdma/infiniband-diags
-tag_prefix: infiniband-diags-
+src_repo: weiny2/libibmad
+tag_prefix:
 separator: "."
-git_tag:
-- 2018-08-02 ls
-- 2019-05-12 2.2.0
-- 2018-08-02 2.1.0
-- 2017-05-24 2.0.0
-- 2016-07-27 1.6.7
diff --git a/upstream-info/libmpc.yaml b/upstream-info/libmpc.yaml
index a1504a41924e0f420ed83e6b5778d7993726b352..d4de57590f01c376acd5da9c88a2f1ac6bf80a84 100644
--- a/upstream-info/libmpc.yaml
+++ b/upstream-info/libmpc.yaml
@@ -1,8 +1,5 @@
 ---
 version_control: git
-src_repo: https://gforge.inria.fr/anonscm/git/mpc/mpc.git
-tag_prefix: "^v"
+src_repo: git://git.pld-linux.org/packages/libmpc.git 
+tag_prefix: "^auto/th/libmpc-"
 separator: "."
-git_url: https://gforge.inria.fr/anonscm/git/mpc/mpc.git
-git_tag:
-- 2018-01-11 1.1.0
diff --git a/upstream-info/libomxil-bellagio.yaml b/upstream-info/libomxil-bellagio.yaml
index a5e6c5e23635b1ae7916c2558a64665bf3c8b859..dd070965a8337797ad977a88b3192adbda86d4f2 100644
--- a/upstream-info/libomxil-bellagio.yaml
+++ b/upstream-info/libomxil-bellagio.yaml
@@ -1,9 +1,5 @@
 ---
-version_control: github
-src_repo: felipec/libomxil-bellagio
-tag_prefix: "^"
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/omxil/files/omxil
+tag_prefix: "^Bellagio%20"
 separator: "."
-git_url: https://github.com/felipec/libomxil-bellagio.git
-git_tag:
-- 2008-09-18 0.9.1
-- 2008-07-04 0.9.0
diff --git a/upstream-info/lockdev.yaml b/upstream-info/lockdev.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7b6160fbde5ff9588724e8a61c7884e34d2ce211
--- /dev/null
+++ b/upstream-info/lockdev.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: eurolinux-enterprise-linux-sources/lockdev
+tag_prefix: "^lockdev-"
+separator: "."
diff --git a/upstream-info/lshw.yaml b/upstream-info/lshw.yaml
index 256a47058237c08a3b8f956978ff0f04d2c341e2..f7e01f3a54a1dc006639a8f20310e522a77e6752 100644
--- a/upstream-info/lshw.yaml
+++ b/upstream-info/lshw.yaml
@@ -1,6 +1,5 @@
 ---
 version_control: git
 src_repo: https://ezix.org/src/pkg/lshw.git
-tag_prefix: 
+tag_prefix: "^B." 
 separator: "."
-git_url: https://ezix.org/src/pkg/lshw.git
diff --git a/upstream-info/mailcap.yaml b/upstream-info/mailcap.yaml
index a2a50955be8ce11fd75947a47daad5be18fd48d4..8f37920ef196957a8168a1d4115770277f3e552a 100644
--- a/upstream-info/mailcap.yaml
+++ b/upstream-info/mailcap.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: git
 src_repo: https://pagure.io/mailcap
-tag_prefix: "^r2-1"
+tag_prefix: "^r"
 separator: "-"
diff --git a/upstream-info/mesa-libGLw.yaml b/upstream-info/mesa-libGLw.yaml
index 3e5fa0f5f3dc8bcfdcba7e8be676a70a0e804245..3878beb64d7a4815ba2563feb9c58d6cf228b75b 100644
--- a/upstream-info/mesa-libGLw.yaml
+++ b/upstream-info/mesa-libGLw.yaml
@@ -1,7 +1,5 @@
 ---
 version_control: git
-src_repo: https://gitlab.freedesktop.org/mesa/glw.git
-tag_prefix: 
+src_repo: git://git.pld-linux.org/packages/Mesa-libGLw.git 
+tag_prefix: "^auto/th/Mesa-libGLw-" 
 separator: "."
-git_url: https://gitlab.freedesktop.org/mesa/glw.git
-git_tag:
diff --git a/upstream-info/mutt.yaml b/upstream-info/mutt.yaml
index 411274eedf3c365b805bb149ae2d6fcab5d382ee..94becf294e57a780fee6ebe35d0391947cb61288 100644
--- a/upstream-info/mutt.yaml
+++ b/upstream-info/mutt.yaml
@@ -1,14 +1,5 @@
 ---
 version_control: git
 src_repo: https://gitlab.com/muttmua/mutt.git
-tag_prefix: mutt-
-separator: "."
-git_url: https://gitlab.com/muttmua/mutt.git
-git_tag:
-- 2020-07-11 mutt-1-14-6-rel
-- 2020-06-23 mutt-1-14-5-rel
-- 2020-06-18 mutt-1-14-4-rel
-- 2020-06-14 mutt-1-14-3-rel
-- 2020-05-25 mutt-1-14-2-rel
-- 2020-05-16 mutt-1-14-1-rel
-- 2020-05-02 mutt-1-14-rel
+tag_pattern: "mutt-(.*)-rel"
+separator: "-"
diff --git a/upstream-info/mvel.yaml b/upstream-info/mvel.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..799f24c412980027ceafcbc49313252782ff8585
--- /dev/null
+++ b/upstream-info/mvel.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: mvel/mvel
+tag_pattern: "mvel2-(.*).Final"
+separator: "."
diff --git a/upstream-info/netty-tcnative.yaml b/upstream-info/netty-tcnative.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c6b6c5f546268f84481476b3b8e5a13252c0440e
--- /dev/null
+++ b/upstream-info/netty-tcnative.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: netty/netty-tcnative
+tag_pattern: "netty-tcnative-parent-(.*).Final|Fork.*"
+separator: "."
diff --git a/upstream-info/nmap.yaml b/upstream-info/nmap.yaml
index 70926e26c687ed8f475677d44c592554970e0b9c..3eecf25d9dbb17e213d56165e38e7e549c7234dc 100644
--- a/upstream-info/nmap.yaml
+++ b/upstream-info/nmap.yaml
@@ -1,4 +1,4 @@
 version_control: svn
 src_repo: https://svn.nmap.org/nmap/
-tag_prefix: NA
-separator: .
\ No newline at end of file
+tag_prefix:
+separator: .
diff --git a/upstream-info/openssh.yaml b/upstream-info/openssh.yaml
index 53f65eb4518013efd2cb8ca237c7186c56c7bea1..ba3f11e4a3c6a1f496b73de6a5de077cb5eeae75 100644
--- a/upstream-info/openssh.yaml
+++ b/upstream-info/openssh.yaml
@@ -1,6 +1,5 @@
 ---
 version_control: git
 src_repo: https://anongit.mindrot.org/openssh.git
-tag_prefix: V.
-separator: _
-git_url: https://anongit.mindrot.org/openssh.git
+tag_prefix: "V_"
+separator: "_"
diff --git a/upstream-info/perl-BSSolv.yaml b/upstream-info/perl-BSSolv.yaml
index ad68b520c9190c84c092827ea99cc316d0ed5e1a..a8165baf84f6f8e4d077a7e6ed399c1631e312ce 100644
--- a/upstream-info/perl-BSSolv.yaml
+++ b/upstream-info/perl-BSSolv.yaml
@@ -1,20 +1,5 @@
 ---
 version_control: github
 src_repo: openSUSE/perl-BSSolv
+tag_prefix:
 separator: "."
-git_url: https://github.com/openSUSE/perl-BSSolv.git
-git_tag:
-- 2020-02-17 0.17
-- 2018-12-13 0.15
-- 2018-02-12 0.14
-- 2017-08-01 0.13
-- 2017-04-27 0.12
-- 2017-03-06 0.11
-- 2017-03-02 0.10
-- 2016-07-05 0.09
-- 2016-04-01 0.08
-- 2016-04-01 0.07
-- 2016-03-15 0.06
-- 2015-08-18 0.05
-- 2015-08-18 0.04
-- 2015-08-03 0.03
diff --git a/upstream-info/perl-Env.yaml b/upstream-info/perl-Env.yaml
index 867b26d16afdd28c11476a27275ecd245681b1a7..9ac155819c448de359255f5dc4b260cd976be40e 100644
--- a/upstream-info/perl-Env.yaml
+++ b/upstream-info/perl-Env.yaml
@@ -1,11 +1,5 @@
 ---
-version_control: github
-src_repo: rafl/env
+version_control: metacpan
+src_repo: Env
 tag_prefix: 
 separator: "."
-git_url: https://github.com/rafl/env.git
-git_tag:
-- 2013-03-02 1.40
-- 2011-07-09 1.03
-- 2010-12-15 1.02
-- 2010-12-10 1.01