Changeset 7b37334


Ignore:
Timestamp:
11/27/13 18:41:25 (22 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2, stable/10
Children:
9bd855e, a628ab0
Parents:
4309def (diff), cef0aac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-usermanager/usermanagerback.cpp

    rd04fae7b rb2eecb3  
    3939    homeLocRegExp.setPattern("^(/usr)?/home/?"); 
    4040    usernameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    41     passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"$%^&*()_+=#'`@~:?<>|{}\\-.,]*)+"); 
     41    passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"$%^&*()_+=#'`@~:?<>|{}\\x5b;\\-.,\\x5d]*)+"); 
    4242    groupnameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    4343} 
  • src-sh/pbi-manager10/pbi-manager

    rc15e380 r4309def  
    16701670        # Check first if we have this pkg in PKGNG 
    16711671        if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then 
    1672                 local testPkgVer="`pkg rquery %v ${PBI_MAKEPORT}`" 
     1672                testPkgVer="`pkg rquery '%v' ${PBI_MAKEPORT}`" 
    16731673                if [ -n "$testPkgVer" ] ; then 
    1674                         export PBI_PROGVERSION="$testPkgVer" 
     1674                        PBI_PROGVERSION="$testPkgVer" 
     1675                        # If we have a REVISION, use it as well 
     1676                        if [ -n "$PBI_PROGREVISION" ] ; then 
     1677                                PBI_PROGVERSION="${PBI_PROGVERSION}_${PBI_PROGREVISION}" 
     1678                        fi 
    16751679                        return 0 
    16761680                fi 
Note: See TracChangeset for help on using the changeset viewer.